Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/sommerfeld_i386mp_1]: src/sys/arch/i386 catch up with -current
details: https://anonhg.NetBSD.org/src/rev/f02fde592a82
branches: sommerfeld_i386mp_1
changeset: 482425:f02fde592a82
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Thu Jul 19 08:57:25 2001 +0000
description:
catch up with -current
diffstat:
sys/arch/i386/conf/CARDBUS | 11 ++++-------
sys/arch/i386/conf/GENERIC | 13 ++++++-------
sys/arch/i386/conf/GENERIC_LAPTOP | 9 ++++-----
sys/arch/i386/conf/GENERIC_TINY | 11 +++++------
sys/arch/i386/conf/INSTALL | 9 +++------
sys/arch/i386/conf/IOPENER | 9 ++++-----
sys/arch/i386/conf/MINBAR | 8 +++-----
sys/arch/i386/conf/files.i386 | 9 ++++++++-
sys/arch/i386/i386/apm.c | 5 ++++-
sys/arch/i386/i386/locore.s | 14 +++-----------
sys/arch/i386/i386/machdep.c | 11 ++++++++++-
sys/arch/i386/i386/microtime.s | 4 ++--
sys/arch/i386/i386/pmap.c | 4 ++--
sys/arch/i386/include/intr.h | 5 +++--
sys/arch/i386/include/segments.h | 6 +++++-
sys/arch/i386/isa/vector.s | 4 ++--
sys/arch/i386/pci/pci_machdep.c | 5 +++--
17 files changed, 71 insertions(+), 66 deletions(-)
diffs (truncated from 556 to 300 lines):
diff -r a86c90c47538 -r f02fde592a82 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Sat Jul 14 03:05:52 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS Thu Jul 19 08:57:25 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.28.2.4 2001/05/13 00:48:51 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.28.2.5 2001/07/19 08:57:25 sommerfeld Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
@@ -8,7 +8,7 @@
include "arch/i386/conf/std.i386"
-#ident "CARDBUS-$Revision: 1.28.2.4 $"
+#ident "CARDBUS-$Revision: 1.28.2.5 $"
maxusers 32 # estimated number of users
@@ -81,6 +81,7 @@
options COMPAT_15 # NetBSD 1.5,
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_SVR4 # binary compatibility with SVR4
options COMPAT_IBCS2 # binary compatibility with SCO and ISC
@@ -134,9 +135,7 @@
options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
-
-# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
-#options TCP_COMPAT_42
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
@@ -401,7 +400,6 @@
#bha* at pci? dev ? function ? # BusLogic 9xx SCSI
#dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI (old driver)
#siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
@@ -454,7 +452,6 @@
#scsibus* at iopsp?
#scsibus* at isp?
#scsibus* at nca?
-#scsibus* at ncr?
#scsibus* at pcscp?
#scsibus* at sea?
#scsibus* at siop?
diff -r a86c90c47538 -r f02fde592a82 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Sat Jul 14 03:05:52 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC Thu Jul 19 08:57:25 2001 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.300.2.19 2001/07/04 20:11:12 sommerfeld Exp $
+# $NetBSD: GENERIC,v 1.300.2.20 2001/07/19 08:57:25 sommerfeld Exp $
#
# GENERIC -- everything that's currently supported
#
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.300.2.19 $"
+#ident "GENERIC-$Revision: 1.300.2.20 $"
maxusers 32 # estimated number of users
@@ -82,11 +82,14 @@
options COMPAT_15 # NetBSD 1.5,
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_SVR4 # binary compatibility with SVR4
options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
+#options COMPAT_MACH # binary compatibility with Mach binaries
+#options EXEC_MACHO # exec MACH-O binaries
#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
@@ -135,9 +138,7 @@
options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
-
-# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
-#options TCP_COMPAT_42
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
@@ -405,7 +406,6 @@
dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI (old driver)
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
@@ -459,7 +459,6 @@
scsibus* at iopsp?
scsibus* at isp?
#scsibus* at nca?
-#scsibus* at ncr?
scsibus* at pcscp?
scsibus* at sea?
scsibus* at siop?
diff -r a86c90c47538 -r f02fde592a82 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Sat Jul 14 03:05:52 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Thu Jul 19 08:57:25 2001 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC_LAPTOP,v 1.8.2.4 2001/05/13 00:48:52 sommerfeld Exp $
+# $NetBSD: GENERIC_LAPTOP,v 1.8.2.5 2001/07/19 08:57:26 sommerfeld Exp $
#
# GENERIC -- everything that's currently supported
#
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.8.2.4 $"
+#ident "GENERIC-$Revision: 1.8.2.5 $"
maxusers 32 # estimated number of users
@@ -78,6 +78,7 @@
options COMPAT_15 # NetBSD 1.5,
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
options COMPAT_SVR4 # binary compatibility with SVR4
options COMPAT_IBCS2 # binary compatibility with SCO and ISC
@@ -131,9 +132,7 @@
options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
-
-# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
-#options TCP_COMPAT_42
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
diff -r a86c90c47538 -r f02fde592a82 sys/arch/i386/conf/GENERIC_TINY
--- a/sys/arch/i386/conf/GENERIC_TINY Sat Jul 14 03:05:52 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_TINY Thu Jul 19 08:57:25 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.22.2.3 2001/04/30 16:23:08 sommerfeld Exp $
+# $NetBSD: GENERIC_TINY,v 1.22.2.4 2001/07/19 08:57:26 sommerfeld Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -77,6 +77,7 @@
options COMPAT_14 # NetBSD 1.4,
#options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
@@ -122,9 +123,7 @@
#options PPP_FILTER # Active filter support for PPP (requires bpf)
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options IPFILTER_LOG # ipmon(8) log support
-
-# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
-#options TCP_COMPAT_42
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
@@ -284,7 +283,7 @@
#dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
#bha* at pci? dev ? function ? # BusLogic 9xx SCSI
#isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
+#siop* at pci? dev ? function ? # NCR 53c8xx SCSI
# EISA SCSI controllers
#ahb* at eisa? slot ? # Adaptec 174[02] SCSI
@@ -320,8 +319,8 @@
#scsibus* at bha?
#scsibus* at dpt?
#scsibus* at isp?
-#scsibus* at ncr?
#scsibus* at sea?
+#scsibus* at siop?
#scsibus* at uha?
#scsibus* at wds?
diff -r a86c90c47538 -r f02fde592a82 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL Sat Jul 14 03:05:52 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL Thu Jul 19 08:57:25 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.135.2.12 2001/06/24 19:29:50 sommerfeld Exp $
+# $NetBSD: INSTALL,v 1.135.2.13 2001/07/19 08:57:26 sommerfeld Exp $
#
# INSTALL - Installation kernel.
#
@@ -91,6 +91,7 @@
options COMPAT_14 # NetBSD 1.4,
#options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
@@ -137,9 +138,7 @@
#options PPP_DEFLATE # Deflate compression support for PPP
#options PPP_FILTER # Active filter support for PPP (requires bpf)
#options PFIL_HOOKS # pfil(9) packet filter hooks
-
-# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
-#options TCP_COMPAT_42
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
@@ -303,7 +302,6 @@
dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI
siop* at pci? dev ? function ? # NCR 53c8xx SCSI (new driver)
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
@@ -352,7 +350,6 @@
scsibus* at iopsp?
scsibus* at isp?
#scsibus* at nca?
-#scsibus* at ncr?
scsibus* at siop?
scsibus* at pcscp?
scsibus* at sea?
diff -r a86c90c47538 -r f02fde592a82 sys/arch/i386/conf/IOPENER
--- a/sys/arch/i386/conf/IOPENER Sat Jul 14 03:05:52 2001 +0000
+++ b/sys/arch/i386/conf/IOPENER Thu Jul 19 08:57:25 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IOPENER,v 1.11.4.4 2001/05/13 00:48:52 sommerfeld Exp $
+# $NetBSD: IOPENER,v 1.11.4.5 2001/07/19 08:57:26 sommerfeld Exp $
#
# IOPENER -- GENERIC-like kernel for the Netpliance i-opener
# from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -6,7 +6,7 @@
include "arch/i386/conf/std.i386"
-#ident "IOPENER-$Revision: 1.11.4.4 $"
+#ident "IOPENER-$Revision: 1.11.4.5 $"
maxusers 32 # estimated number of users
@@ -65,6 +65,7 @@
options COMPAT_14 # NetBSD 1.4,
options COMPAT_43 # and 4.3BSD
#options COMPAT_386BSD_MBRPART # recognize old partition ID
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
@@ -117,9 +118,7 @@
#options PPP_FILTER # Active filter support for PPP (requires bpf)
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options IPFILTER_LOG # ipmon(8) log support
-
-# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
-#options TCP_COMPAT_42
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
diff -r a86c90c47538 -r f02fde592a82 sys/arch/i386/conf/MINBAR
--- a/sys/arch/i386/conf/MINBAR Sat Jul 14 03:05:52 2001 +0000
+++ b/sys/arch/i386/conf/MINBAR Thu Jul 19 08:57:25 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MINBAR,v 1.20.2.3 2001/04/30 16:23:09 sommerfeld Exp $
+# $NetBSD: MINBAR,v 1.20.2.4 2001/07/19 08:57:26 sommerfeld Exp $
# From: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp
#
# MINBAR -- offshore CVS server
@@ -83,6 +83,7 @@
options COMPAT_14 # NetBSD 1.4,
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
+#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
#options COMPAT_SVR4 # binary compatibility with SVR4
#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
@@ -129,9 +130,7 @@
#options PPP_FILTER # Active filter support for PPP (requires bpf)
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options IPFILTER_LOG # ipmon(8) log support
-
-# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
-#options TCP_COMPAT_42
Home |
Main Index |
Thread Index |
Old Index