Fix fallout from previous uvm.h cleanup.
- pmap(9) needs uvm/uvm_extern.h. - x86/pmap.h is not usable on its own; it is only usable if included via uvm/uvm_extern.h (-> uvm/uvm_pmap.h -> machine/pmap.h). - Make nvmm.h and nvmm_internal.h standalone.
This commit is contained in:
riastradh
parent
45b0095c0d
commit
0b8d836aa7
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pmap.c,v 1.406 2020/09/02 17:37:57 bouyer Exp $ */
|
||||
/* $NetBSD: pmap.c,v 1.407 2020/09/06 02:18:53 riastradh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2008, 2010, 2016, 2017, 2019, 2020 The NetBSD Foundation, Inc.
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.406 2020/09/02 17:37:57 bouyer Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.407 2020/09/06 02:18:53 riastradh Exp $");
|
||||
|
||||
#include "opt_user_ldt.h"
|
||||
#include "opt_lockdebug.h"
|
||||
|
|
@ -167,7 +167,6 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.406 2020/09/02 17:37:57 bouyer Exp $");
|
|||
#include <machine/cpuvar.h>
|
||||
#include <machine/cputypes.h>
|
||||
|
||||
#include <x86/pmap.h>
|
||||
#include <x86/pmap_pv.h>
|
||||
|
||||
#include <x86/i82489reg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: x86_xpmap.c,v 1.89 2020/05/26 10:10:32 bouyer Exp $ */
|
||||
/* $NetBSD: x86_xpmap.c,v 1.90 2020/09/06 02:18:53 riastradh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2017 The NetBSD Foundation, Inc.
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.89 2020/05/26 10:10:32 bouyer Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.90 2020/09/06 02:18:53 riastradh Exp $");
|
||||
|
||||
#include "opt_xen.h"
|
||||
#include "opt_ddb.h"
|
||||
|
|
@ -109,8 +109,8 @@ __KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.89 2020/05/26 10:10:32 bouyer Exp $"
|
|||
|
||||
#include <uvm/uvm.h>
|
||||
|
||||
#include <x86/pmap.h>
|
||||
#include <machine/gdt.h>
|
||||
|
||||
#include <xen/xenfunc.h>
|
||||
|
||||
#include <dev/isa/isareg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: xen_pmap.c,v 1.38 2020/07/19 13:55:09 maxv Exp $ */
|
||||
/* $NetBSD: xen_pmap.c,v 1.39 2020/09/06 02:18:53 riastradh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Manuel Bouyer.
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.38 2020/07/19 13:55:09 maxv Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.39 2020/09/06 02:18:53 riastradh Exp $");
|
||||
|
||||
#include "opt_lockdebug.h"
|
||||
#include "opt_multiprocessor.h"
|
||||
|
|
@ -125,7 +125,6 @@ __KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.38 2020/07/19 13:55:09 maxv Exp $");
|
|||
#include <machine/isa_machdep.h>
|
||||
#include <machine/cpuvar.h>
|
||||
|
||||
#include <x86/pmap.h>
|
||||
#include <x86/pmap_pv.h>
|
||||
|
||||
#include <x86/i82489reg.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nvmm_internal.h,v 1.18 2020/09/05 07:22:25 maxv Exp $ */
|
||||
/* $NetBSD: nvmm_internal.h,v 1.19 2020/09/06 02:18:53 riastradh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
|
||||
|
|
@ -31,6 +31,18 @@
|
|||
#ifndef _NVMM_INTERNAL_H_
|
||||
#define _NVMM_INTERNAL_H_
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <sys/lwp.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/rwlock.h>
|
||||
#include <sys/sched.h>
|
||||
|
||||
#include <dev/nvmm/nvmm.h>
|
||||
|
||||
struct uvm_object;
|
||||
struct vmspace;
|
||||
|
||||
#define NVMM_MAX_MACHINES 128
|
||||
#define NVMM_MAX_VCPUS 256
|
||||
#define NVMM_MAX_HMAPPINGS 32
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nvmm_x86.c,v 1.19 2020/09/05 16:30:11 riastradh Exp $ */
|
||||
/* $NetBSD: nvmm_x86.c,v 1.20 2020/09/06 02:18:53 riastradh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
|
||||
|
|
@ -29,16 +29,17 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.19 2020/09/05 16:30:11 riastradh Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.20 2020/09/06 02:18:53 riastradh Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/cpu.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
||||
#include <x86/cputypes.h>
|
||||
#include <x86/specialreg.h>
|
||||
#include <x86/pmap.h>
|
||||
|
||||
#include <dev/nvmm/nvmm.h>
|
||||
#include <dev/nvmm/nvmm_internal.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nvmm_x86_svm.c,v 1.78 2020/09/05 16:30:11 riastradh Exp $ */
|
||||
/* $NetBSD: nvmm_x86_svm.c,v 1.79 2020/09/06 02:18:53 riastradh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.78 2020/09/05 16:30:11 riastradh Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.79 2020/09/06 02:18:53 riastradh Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -40,12 +40,13 @@ __KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.78 2020/09/05 16:30:11 riastradh
|
|||
#include <sys/mman.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
#include <uvm/uvm_page.h>
|
||||
|
||||
#include <x86/cputypes.h>
|
||||
#include <x86/specialreg.h>
|
||||
#include <x86/pmap.h>
|
||||
#include <x86/dbregs.h>
|
||||
#include <x86/cpu_counter.h>
|
||||
|
||||
#include <machine/cpuvar.h>
|
||||
|
||||
#include <dev/nvmm/nvmm.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: nvmm_x86_vmx.c,v 1.77 2020/09/05 16:30:11 riastradh Exp $ */
|
||||
/* $NetBSD: nvmm_x86_vmx.c,v 1.78 2020/09/06 02:18:53 riastradh Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.77 2020/09/05 16:30:11 riastradh Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.78 2020/09/06 02:18:53 riastradh Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -41,12 +41,13 @@ __KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.77 2020/09/05 16:30:11 riastradh
|
|||
#include <sys/bitops.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
#include <uvm/uvm_page.h>
|
||||
|
||||
#include <x86/cputypes.h>
|
||||
#include <x86/specialreg.h>
|
||||
#include <x86/pmap.h>
|
||||
#include <x86/dbregs.h>
|
||||
#include <x86/cpu_counter.h>
|
||||
|
||||
#include <machine/cpuvar.h>
|
||||
|
||||
#include <dev/nvmm/nvmm.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mapper.c,v 1.3 2020/09/05 16:30:12 riastradh Exp $ */
|
||||
/* $NetBSD: mapper.c,v 1.4 2020/09/06 02:18:53 riastradh Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2019 The NetBSD Foundation, Inc.
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mapper.c,v 1.3 2020/09/05 16:30:12 riastradh Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mapper.c,v 1.4 2020/09/06 02:18:53 riastradh Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/conf.h>
|
||||
|
|
@ -37,6 +37,8 @@ __KERNEL_RCSID(0, "$NetBSD: mapper.c,v 1.3 2020/09/05 16:30:12 riastradh Exp $")
|
|||
#include <sys/module.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
||||
/*
|
||||
* Creating a device /dev/mapper for demonstration.
|
||||
* To use this device you need to do:
|
||||
|
|
|
|||
Loading…
Reference in New Issue