diff options
author | Dale Rahn <drahn@cvs.openbsd.org> | 2010-06-27 08:06:00 +0000 |
---|---|---|
committer | Dale Rahn <drahn@cvs.openbsd.org> | 2010-06-27 08:06:00 +0000 |
commit | a6e5ebf8414c582d2c06f9e89cc616a6c76b5dde (patch) | |
tree | 2e1c79d677e7d4690c86c5e8a72745406884e630 /sys/arch | |
parent | 9abe95ca583eaf4911dbe6a076adf7018da1d15b (diff) |
back out for duplicate declarations sprinkled by viking raiders
as bob did for zaurus
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/armish/armish/armish_machdep.c | 6 | ||||
-rw-r--r-- | sys/arch/beagle/beagle/beagle_machdep.c | 6 | ||||
-rw-r--r-- | sys/arch/palm/palm/palm_machdep.c | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/arch/armish/armish/armish_machdep.c b/sys/arch/armish/armish/armish_machdep.c index 399cd56e14f..2477ebea346 100644 --- a/sys/arch/armish/armish/armish_machdep.c +++ b/sys/arch/armish/armish/armish_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armish_machdep.c,v 1.15 2010/06/27 03:03:48 thib Exp $ */ +/* $OpenBSD: armish_machdep.c,v 1.16 2010/06/27 08:05:59 drahn Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -91,7 +91,6 @@ #include <sys/termios.h> #include <sys/kcore.h> -#include <uvm/uvm.h> #include <uvm/uvm_extern.h> #include <sys/conf.h> @@ -176,9 +175,6 @@ pv_addr_t minidataclean; paddr_t msgbufphys; -struct uvm_constraint_range dma_constraint = { 0x0, (paddr_t)-1 }; -struct uvm_constraint_range *uvm_md_constraints[] = { NULL }; - extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; extern u_int undefined_handler_address; diff --git a/sys/arch/beagle/beagle/beagle_machdep.c b/sys/arch/beagle/beagle/beagle_machdep.c index 9b2952d8256..3e3eec61337 100644 --- a/sys/arch/beagle/beagle/beagle_machdep.c +++ b/sys/arch/beagle/beagle/beagle_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: beagle_machdep.c,v 1.5 2010/06/27 03:03:48 thib Exp $ */ +/* $OpenBSD: beagle_machdep.c,v 1.6 2010/06/27 08:05:59 drahn Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -122,7 +122,6 @@ #include <sys/reboot.h> #include <sys/termios.h> -#include <uvm/uvm.h> #include <uvm/uvm_extern.h> #include <sys/conf.h> @@ -208,9 +207,6 @@ pv_addr_t minidataclean; vaddr_t msgbufphys; -struct uvm_constraint_range dma_constraint = { 0x0, (paddr_t)-1 }; -struct uvm_constraint_range *uvm_md_constraints[] = { NULL }; - extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; extern u_int undefined_handler_address; diff --git a/sys/arch/palm/palm/palm_machdep.c b/sys/arch/palm/palm/palm_machdep.c index 5b3700a44a3..b776c805f5a 100644 --- a/sys/arch/palm/palm/palm_machdep.c +++ b/sys/arch/palm/palm/palm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: palm_machdep.c,v 1.4 2010/06/27 03:03:48 thib Exp $ */ +/* $OpenBSD: palm_machdep.c,v 1.5 2010/06/27 08:05:59 drahn Exp $ */ /* $NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */ /* @@ -123,7 +123,6 @@ #include <sys/termios.h> #include <sys/kcore.h> -#include <uvm/uvm.h> #include <uvm/uvm_extern.h> #include <sys/conf.h> @@ -214,9 +213,6 @@ pv_addr_t minidataclean; paddr_t msgbufphys; -struct uvm_constraint_range dma_constraint = { 0x0, (paddr_t)-1 }; -struct uvm_constraint_range *uvm_md_constraints[] = { NULL }; - extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; extern u_int undefined_handler_address; |