diff options
| author |   mpi <mpi@openbsd.org> | 2014-04-01 09:05:03 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2014-04-01 09:05:03 +0000 |
| commit | 8fe887479e60e6b3afbcaf29a556f4fc37d26737 (patch) | |
| tree | 07dc35d18f89fe698031d7d028bac9511cad1778 | |
| parent | cleanup forkmda() and get rid of a useless seteuid()-based dance (diff) | |
| download | wireguard-openbsd-8fe887479e60e6b3afbcaf29a556f4fc37d26737.tar.xz wireguard-openbsd-8fe887479e60e6b3afbcaf29a556f4fc37d26737.zip | |
More <uvm/uvm.h> -> <uvm/uvm_extern.h> cleaning.
ok kettenis@, deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/bus_dma.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/amd64/gdt.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/amd64/genassym.cf | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/pci/agp_machdep.c | 7 | ||||
| -rw-r--r-- | sys/arch/i386/i386/gdt.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/kvm86.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/pci/agp_machdep.c | 7 |
7 files changed, 20 insertions, 18 deletions
diff --git a/sys/arch/amd64/amd64/bus_dma.c b/sys/arch/amd64/amd64/bus_dma.c index b340a8fa449..0f544b6b451 100644 --- a/sys/arch/amd64/amd64/bus_dma.c +++ b/sys/arch/amd64/amd64/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.41 2013/12/12 21:04:50 kettenis Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.42 2014/04/01 09:05:03 mpi Exp $ */ /* $NetBSD: bus_dma.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */ /*- @@ -98,7 +98,7 @@ #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> -#include <uvm/uvm.h> +#include <uvm/uvm_extern.h> #include "ioapic.h" diff --git a/sys/arch/amd64/amd64/gdt.c b/sys/arch/amd64/amd64/gdt.c index df975b5758a..94ae7c5ffc8 100644 --- a/sys/arch/amd64/amd64/gdt.c +++ b/sys/arch/amd64/amd64/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.18 2010/11/13 04:16:42 guenther Exp $ */ +/* $OpenBSD: gdt.c,v 1.19 2014/04/01 09:05:03 mpi Exp $ */ /* $NetBSD: gdt.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /*- @@ -40,7 +40,7 @@ #include <sys/proc.h> #include <sys/mutex.h> -#include <uvm/uvm.h> +#include <uvm/uvm_extern.h> #include <machine/gdt.h> #include <machine/tss.h> diff --git a/sys/arch/amd64/amd64/genassym.cf b/sys/arch/amd64/amd64/genassym.cf index 5ae35085109..e13a477a767 100644 --- a/sys/arch/amd64/amd64/genassym.cf +++ b/sys/arch/amd64/amd64/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.29 2012/04/17 16:02:33 guenther Exp $ +# $OpenBSD: genassym.cf,v 1.30 2014/04/01 09:05:03 mpi Exp $ # Written by Artur Grabowski art@openbsd.org, Public Domain include <sys/param.h> @@ -7,7 +7,7 @@ include <sys/resourcevar.h> include <sys/device.h> include <sys/user.h> -include <uvm/uvm.h> +include <uvm/uvm_extern.h> include <machine/trap.h> include <machine/pmap.h> @@ -30,8 +30,6 @@ define L1_SLOT_KERNBASE pl1_pi(KERNBASE) export VM_MAXUSER_ADDRESS export VM_MIN_KERNEL_ADDRESS -define UVM_PAGE_IDLE_ZERO offsetof(struct uvm, page_idle_zero) - struct proc member p_addr member p_priority diff --git a/sys/arch/amd64/pci/agp_machdep.c b/sys/arch/amd64/pci/agp_machdep.c index 0183fb89bf6..0634fa7e4e3 100644 --- a/sys/arch/amd64/pci/agp_machdep.c +++ b/sys/arch/amd64/pci/agp_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_machdep.c,v 1.10 2014/03/26 14:41:41 mpi Exp $ */ +/* $OpenBSD: agp_machdep.c,v 1.11 2014/04/01 09:05:03 mpi Exp $ */ /* * Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org> @@ -51,10 +51,11 @@ #include <dev/pci/pcidevs.h> #include <dev/pci/agpvar.h> +#include <uvm/uvm_extern.h> + #include <machine/cpufunc.h> #include <machine/bus.h> - -#include <uvm/uvm.h> +#include <machine/pmap.h> void agp_flush_cache(void) diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c index a0d366477a3..a053b0e3bff 100644 --- a/sys/arch/i386/i386/gdt.c +++ b/sys/arch/i386/i386/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.31 2012/12/05 23:20:12 deraadt Exp $ */ +/* $OpenBSD: gdt.c,v 1.32 2014/04/01 09:05:03 mpi Exp $ */ /* $NetBSD: gdt.c,v 1.28 2002/12/14 09:38:50 junyoung Exp $ */ /*- @@ -53,7 +53,7 @@ #include <sys/lock.h> #include <sys/mutex.h> -#include <uvm/uvm.h> +#include <uvm/uvm_extern.h> #include <machine/gdt.h> #include <machine/pcb.h> diff --git a/sys/arch/i386/i386/kvm86.c b/sys/arch/i386/i386/kvm86.c index 00c2330c02d..ef8900dd647 100644 --- a/sys/arch/i386/i386/kvm86.c +++ b/sys/arch/i386/i386/kvm86.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm86.c,v 1.6 2012/12/05 23:20:12 deraadt Exp $ */ +/* $OpenBSD: kvm86.c,v 1.7 2014/04/01 09:05:03 mpi Exp $ */ /* $NetBSD: kvm86.c,v 1.10 2005/12/26 19:23:59 perry Exp $ */ /* * Copyright (c) 2002 @@ -33,7 +33,9 @@ #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/lock.h> -#include <uvm/uvm.h> + +#include <uvm/uvm_extern.h> + #include <machine/pcb.h> #include <machine/pte.h> #include <machine/pmap.h> diff --git a/sys/arch/i386/pci/agp_machdep.c b/sys/arch/i386/pci/agp_machdep.c index 4ad2510e4a7..64bb3b1a95c 100644 --- a/sys/arch/i386/pci/agp_machdep.c +++ b/sys/arch/i386/pci/agp_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_machdep.c,v 1.16 2014/03/26 14:41:41 mpi Exp $ */ +/* $OpenBSD: agp_machdep.c,v 1.17 2014/04/01 09:05:03 mpi Exp $ */ /* * Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org> @@ -51,10 +51,11 @@ #include <dev/pci/pcidevs.h> #include <dev/pci/agpvar.h> +#include <uvm/uvm_extern.h> + #include <machine/cpufunc.h> #include <machine/bus.h> - -#include <uvm/uvm.h> +#include <machine/pmap.h> void agp_flush_cache(void) |