summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-06-16 11:11:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-06-16 11:11:14 +0000
commit85b6fdf96bd97d751cdefe70916d4bf99e8d0300 (patch)
tree4de52e7f9a9fd5a9f49bf2a20c466e720223f9cb /sys/arch
parent17a998718b215232c7c500a42c025685cd4b1ec9 (diff)
MACHINE_NONCONTIG always on
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/ALL3
-rw-r--r--sys/arch/i386/conf/BABY3
-rw-r--r--sys/arch/i386/conf/DISKLESS3
-rw-r--r--sys/arch/i386/conf/GANDALF3
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/HELIOS_PCMCIA3
-rw-r--r--sys/arch/i386/conf/INST3
-rw-r--r--sys/arch/i386/conf/LAP3
-rw-r--r--sys/arch/i386/conf/NETTAN3
-rw-r--r--sys/arch/i386/conf/OPRAH1
-rw-r--r--sys/arch/i386/conf/PCMCIA3
-rw-r--r--sys/arch/i386/conf/TDR3
-rw-r--r--sys/arch/i386/include/vmparam.h2
13 files changed, 13 insertions, 23 deletions
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 65abe3fb1d1..6dd3abdf3cd 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $OpenBSD: ALL,v 1.2 1996/06/16 10:33:09 deraadt Exp $
+# $OpenBSD: ALL,v 1.3 1996/06/16 11:11:05 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -20,7 +20,6 @@ options VM86 # Virtual 8086 emulation
#options DUMMY_NOPS # speed hack; recommended
options XSERVER,UCONSOLE
options INSECURE # insecure; allow /dev/mem writing for X
-options MACHINE_NONCONTIG
maxusers 32 # estimated number of users
options TIMEZONE=0 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY
index 554dfcb5d06..84e4cb44d3c 100644
--- a/sys/arch/i386/conf/BABY
+++ b/sys/arch/i386/conf/BABY
@@ -1,4 +1,4 @@
-# $OpenBSD: BABY,v 1.2 1996/06/16 10:33:10 deraadt Exp $
+# $OpenBSD: BABY,v 1.3 1996/06/16 11:11:05 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -16,7 +16,6 @@ options MATH_EMULATE # floating point emulation
#options DUMMY_NOPS # speed hack; recommended
options XSERVER,UCONSOLE
options INSECURE # insecure; allow /dev/mem writing for X
-options MACHINE_NONCONTIG
maxusers 32 # estimated number of users
options TIMEZONE=0 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 273657aaf7c..dd90f6bd0e5 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $OpenBSD: DISKLESS,v 1.8 1996/06/16 10:33:11 deraadt Exp $
+# $OpenBSD: DISKLESS,v 1.9 1996/06/16 11:11:06 deraadt Exp $
# $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
@@ -20,7 +20,6 @@ options MATH_EMULATE # floating point emulation
#options DUMMY_NOPS # speed hack; recommended
options XSERVER,UCONSOLE
-options MACHINE_NONCONTIG
maxusers 32 # estimated number of users
options TIMEZONE=0 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/GANDALF b/sys/arch/i386/conf/GANDALF
index 4ed2ce767fa..54f9dc775b2 100644
--- a/sys/arch/i386/conf/GANDALF
+++ b/sys/arch/i386/conf/GANDALF
@@ -1,7 +1,7 @@
#
# GANDALF -- Dual Tyan P5/133 PCI/EISA bus
#
-# $OpenBSD: GANDALF,v 1.4 1996/06/16 10:33:11 deraadt Exp $
+# $OpenBSD: GANDALF,v 1.5 1996/06/16 11:11:07 deraadt Exp $
#
machine i386 # architecture, used by config; REQUIRED
@@ -16,7 +16,6 @@ options PCIVERBOSE # verbose PCI device information
options DUMMY_NOPS # speed hack; recommanded
options XSERVER,UCONSOLE
#options INSECURE # insecure; allow /dev/mem writing for X
-options MACHINE_NONCONTIG
maxusers 32 # estimated number of users
options TIMEZONE=480 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c35318b861b..e7284f4997f 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.19 1996/06/16 10:33:12 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.20 1996/06/16 11:11:07 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -20,7 +20,6 @@ options MATH_EMULATE # floating point emulation
#options DUMMY_NOPS # speed hack; recommended
options XSERVER,UCONSOLE
options INSECURE # insecure; allow /dev/mem writing for X
-options MACHINE_NONCONTIG
maxusers 32 # estimated number of users
options TIMEZONE=0 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/HELIOS_PCMCIA b/sys/arch/i386/conf/HELIOS_PCMCIA
index ee6432ca740..acd4c2ff5ad 100644
--- a/sys/arch/i386/conf/HELIOS_PCMCIA
+++ b/sys/arch/i386/conf/HELIOS_PCMCIA
@@ -1,4 +1,4 @@
-# $OpenBSD: HELIOS_PCMCIA,v 1.6 1996/06/16 10:33:13 deraadt Exp $
+# $OpenBSD: HELIOS_PCMCIA,v 1.7 1996/06/16 11:11:08 deraadt Exp $
#
# HELIOS_PCMCIA -- Eric Hvozda's notebook
#
@@ -9,7 +9,6 @@ options I486_CPU
options DUMMY_NOPS # speed hack; recommended
options XSERVER,UCONSOLE
-options MACHINE_NONCONTIG
maxusers 64 # estimated number of users
options TIMEZONE=300 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/INST b/sys/arch/i386/conf/INST
index a703897cd44..059ec6e3bd1 100644
--- a/sys/arch/i386/conf/INST
+++ b/sys/arch/i386/conf/INST
@@ -1,4 +1,4 @@
-# $OpenBSD: INST,v 1.3 1996/06/16 10:33:14 deraadt Exp $
+# $OpenBSD: INST,v 1.4 1996/06/16 11:11:08 deraadt Exp $
# $NetBSD: INSTADP,v 1.17 1996/05/20 03:32:19 thorpej Exp $
#
# Install kernels no longer support X.
@@ -17,7 +17,6 @@ options MATH_EMULATE # floating point emulation
#options EXTMEM_SIZE=... # size of extended memory
#options DUMMY_NOPS # speed hack; recommended
-options MACHINE_NONCONTIG
maxusers 8 # estimated number of users
options TIMEZONE=0 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index dd849e6ca57..6e2b4cc3f37 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-# $OpenBSD: LAP,v 1.5 1996/06/16 10:33:15 deraadt Exp $
+# $OpenBSD: LAP,v 1.6 1996/06/16 11:11:09 deraadt Exp $
# $NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
#
# TDR -- Theo Deraadt's 486
@@ -18,7 +18,6 @@ options I586_CPU
options DUMMY_NOPS # speed hack; recommended
options XSERVER,UCONSOLE
-options MACHINE_NONCONTIG
maxusers 10 # estimated number of users
#options TIMEZONE=0 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index c2781e42fbf..95944e77540 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-# $OpenBSD: NETTAN,v 1.5 1996/06/16 10:33:16 deraadt Exp $
+# $OpenBSD: NETTAN,v 1.6 1996/06/16 11:11:09 deraadt Exp $
#
# NETTAN -- Applitron Datasystem AB
#
@@ -13,7 +13,6 @@ options MATH_EMULATE # floating point emulation
#options DUMMY_NOPS # speed hack; recommanded
options XSERVER,UCONSOLE
options INSECURE # insecure; allow /dev/mem writing for X
-options MACHINE_NONCONTIG
maxusers 32 # estimated number of users
options TIMEZONE=0 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index 1ebe3bf2dfd..fb090dfe919 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -13,7 +13,6 @@ options MATH_EMULATE # floating point emulation
#options DUMMY_NOPS # speed hack; recommended
options XSERVER,UCONSOLE
options INSECURE # insecure; allow /dev/mem writing for X
-options MACHINE_NONCONTIG
maxusers 32 # estimated number of users
options TIMEZONE=0 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/PCMCIA b/sys/arch/i386/conf/PCMCIA
index 9ef8747348e..6ce09948f83 100644
--- a/sys/arch/i386/conf/PCMCIA
+++ b/sys/arch/i386/conf/PCMCIA
@@ -1,4 +1,4 @@
-# $Id: PCMCIA,v 1.2 1996/06/16 10:33:18 deraadt Exp $
+# $Id: PCMCIA,v 1.3 1996/06/16 11:11:11 deraadt Exp $
# $Source: /cvs/OpenBSD/src/sys/arch/i386/conf/Attic/PCMCIA,v $
#
# ATHENA-AHA -- ATHENA kernel for Adaptec & others...
@@ -17,7 +17,6 @@ options MATH_EMULATE
options DUMMY_NOPS # speed hack; recommanded
options XSERVER,UCONSOLE
-options MACHINE_NONCONTIG
maxusers 32 # estimated number of users
options TIMEZONE=300 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR
index 881610eb860..86348d00c22 100644
--- a/sys/arch/i386/conf/TDR
+++ b/sys/arch/i386/conf/TDR
@@ -1,4 +1,4 @@
-# $OpenBSD: TDR,v 1.11 1996/06/16 10:33:19 deraadt Exp $
+# $OpenBSD: TDR,v 1.12 1996/06/16 11:11:12 deraadt Exp $
# $NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
#
# TDR -- Theo Deraadt's 486
@@ -18,7 +18,6 @@ options MATH_EMULATE # floating point emulation
options DUMMY_NOPS # speed hack; recommended
options XSERVER,UCONSOLE
-options MACHINE_NONCONTIG
maxusers 10 # estimated number of users
options TIMEZONE=420 # time zone to adjust RTC time by
diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h
index 43a99016713..8de4f0957bf 100644
--- a/sys/arch/i386/include/vmparam.h
+++ b/sys/arch/i386/include/vmparam.h
@@ -139,6 +139,8 @@
/* APTDPTDI<<PDSHIFT */
#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xffc00000)
+#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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 08:41:17 +0000