move MACHINE_NONCONTIG to an include

6 files changed, 7 insertions, 18 deletions

diff --git a/sys/arch/arc/conf/ARCTIC b/sys/arch/arc/conf/ARCTIC
index 0233304f047..1c388b2dc8d 100644
--- a/sys/arch/arc/conf/ARCTIC
+++ b/sys/arch/arc/conf/ARCTIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: ARCTIC,v 1.8 1997/04/29 05:16:40 deraadt Exp $
+#	$OpenBSD: ARCTIC,v 1.9 1997/08/01 11:22:09 deraadt Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -57,7 +57,6 @@ option		COMPAT_43	# compatibility with 4.3BSD binaries
 #option		COMPAT_ULTRIX	# Ultrix binary compatibility (no go yet)
 
 # Special options
-option	 	MACHINE_NONCONTIG	# Support noncontigous memory.
 option		PCCONS_FORCE_WORD	# Max out at 16bit accesses to the
 					# VGA memory
 
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 23c1825e369..27d4cf15f7a 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.19 1997/08/01 11:18:26 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.20 1997/08/01 11:22:09 deraadt Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -59,9 +59,6 @@ option		IPFILTER_LOG	# use /dev/ipl to log IPF
 #option		MULTICAST	# Multicast support
 #option		MROUTING	# Multicast routing support
 
-# Special options
-option		MACHINE_NONCONTIG # Support noncontigous memory.
-
 # Specify storage configuration (its a joke..)
 config		bsd	swap generic
 
diff --git a/sys/arch/arc/conf/P4032 b/sys/arch/arc/conf/P4032
index c25fd3f6baa..f24f703343b 100644
--- a/sys/arch/arc/conf/P4032
+++ b/sys/arch/arc/conf/P4032
@@ -1,4 +1,4 @@
-#	$OpenBSD: P4032,v 1.2 1997/06/23 19:05:36 kstailey Exp $
+#	$OpenBSD: P4032,v 1.3 1997/08/01 11:22:10 deraadt Exp $
 #
 #	Generic configuration file for Algorithmics P4032 board
 #
@@ -60,9 +60,6 @@ option		IPFILTER_LOG	# use /dev/ipl to log IPF
 #options 	MULTICAST	# Multicast support
 #options 	MROUTING	# Multicast routing support
 
-# Special options
-options 	MACHINE_NONCONTIG # Support noncontigous memory.
-
 # Specify storage configuration (its a joke..)
 config		bsd	swap generic
 
diff --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA
index 8441331a85f..9b54e57a1a8 100644
--- a/sys/arch/arc/conf/PICA
+++ b/sys/arch/arc/conf/PICA
@@ -53,9 +53,6 @@ options 	GATEWAY		# IP packet forwarding
 #options 	TPIP
 #options 	EON
 
-# Special options
-#options 	MACHINE_NONCONTIG # Support noncontigous memory.
-
 # Specify storage configuration
 config		bsd	root on sd0 swap on sd0 and sd1
 
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index 969307819d7..5467e6817c9 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.4 1997/08/01 11:19:52 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.5 1997/08/01 11:22:12 deraadt Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -59,9 +59,6 @@ options 	INET		# Internet protocols
 #options 	MULTICAST	# Multicast support
 #options 	MROUTING	# Multicast routing support
 
-# Special options
-option		MACHINE_NONCONTIG # Support noncontigous memory.
-
 # Specify storage configuration using ramdisk
 config		bsd	root on rd0a swap on rd0b
 
diff --git a/sys/arch/arc/include/vmparam.h b/sys/arch/arc/include/vmparam.h
index 056a350318d..e72f314f405 100644
--- a/sys/arch/arc/include/vmparam.h
+++ b/sys/arch/arc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.3 1997/04/19 17:19:59 pefo Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.4 1997/08/01 11:22:14 deraadt Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $	*/
 
 /*
@@ -223,6 +223,8 @@
 #define VM_MIN_KERNEL_ADDRESS	((vm_offset_t)0xC0000000)
 #define VM_MAX_KERNEL_ADDRESS	((vm_offset_t)0xFFFFC000)
 
+#define MACHINE_NONCONTIG	/* VM <=> pmap interface modifier */
+
 /* virtual sizes (bytes) for various kernel submaps */
 #define VM_MBUF_SIZE		(NMBCLUSTERS*MCLBYTES)
 #define VM_KMEM_SIZE		(NKMEMCLUSTERS*CLBYTES)