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 Resynch with mainline.
details: https://anonhg.NetBSD.org/src/rev/972ea6931653
branches: sommerfeld_i386mp_1
changeset: 482500:972ea6931653
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Sun Feb 24 00:17:40 2002 +0000
description:
Resynch with mainline.
diffstat:
sys/arch/i386/MP-UPDATING | 4 ++++
sys/arch/i386/conf/CARDBUS | 6 +++---
sys/arch/i386/conf/GENERIC | 26 ++++++++++++++------------
sys/arch/i386/conf/GENERIC_LAPTOP | 7 ++++---
sys/arch/i386/conf/INSTALL | 5 +++--
sys/arch/i386/conf/IOPENER | 6 +++---
sys/arch/i386/conf/MINBAR | 4 ++--
sys/arch/i386/conf/files.i386 | 15 ++-------------
sys/arch/i386/i386/machdep.c | 25 +++++++++++++++----------
sys/arch/i386/i386/trap.c | 24 ++++++++++++------------
sys/arch/i386/include/cpu.h | 26 ++++++++++++++++----------
sys/arch/i386/include/pcb.h | 4 ++--
12 files changed, 80 insertions(+), 72 deletions(-)
diffs (truncated from 503 to 300 lines):
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/MP-UPDATING
--- a/sys/arch/i386/MP-UPDATING Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/MP-UPDATING Sun Feb 24 00:17:40 2002 +0000
@@ -1,3 +1,7 @@
+Last Synchronized: Sat Feb 23 18:41:03 EST 2002
+
+Pick up pxeboot; merge in joystick rototill, linux compat changes.
+
Last Synchronized: Sun Jan 27 22:33:13 EST 2002
Yet another mergeup.
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/conf/CARDBUS Sun Feb 24 00:17:40 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.28.2.9 2002/01/28 04:21:35 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.28.2.10 2002/02/24 00:17:41 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.9 $"
+#ident "CARDBUS-$Revision: 1.28.2.10 $"
maxusers 32 # estimated number of users
@@ -675,7 +675,7 @@
# MII/PHY support
dmphy* at mii? phy ? # Davicom DM9101 PHYs
exphy* at mii? phy ? # 3Com internal PHYs
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC Sun Feb 24 00:17:40 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.300.2.25 2002/01/28 04:21:35 sommerfeld Exp $
+# $NetBSD: GENERIC,v 1.300.2.26 2002/02/24 00:17:42 sommerfeld Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.300.2.25 $"
+#ident "GENERIC-$Revision: 1.300.2.26 $"
maxusers 32 # estimated number of users
@@ -78,7 +78,7 @@
options LKM # loadable kernel modules
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -297,6 +297,7 @@
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
+pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
@@ -709,7 +710,7 @@
exphy* at mii? phy ? # 3Com internal PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
gphyter* at mii? phy ? # NS83861 Gig-E PHY
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
@@ -1027,14 +1028,15 @@
# RAIDframe is broken with MULTIPROCESSOR / LOCKDEBUG
#pseudo-device raid 8 # RAIDframe disk driver
#options RAID_AUTOCONFIG # auto-configuration of RAID components
-# Options to enable various other RAIDframe RAID types.
-# options RF_INCLUDE_EVENODD=1
-# options RF_INCLUDE_RAID5_RS=1
-# options RF_INCLUDE_PARITYLOGGING=1
-# options RF_INCLUDE_CHAINDECLUSTER=1
-# options RF_INCLUDE_INTERDECLUSTER=1
-# options RF_INCLUDE_PARITY_DECLUSTERING=1
-# options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
+#Options to enable various other RAIDframe RAID types.
+#options RF_INCLUDE_EVENODD=1
+#options RF_INCLUDE_RAID5_RS=1
+#options RF_INCLUDE_PARITYLOGGING=1
+#options RF_INCLUDE_CHAINDECLUSTER=1
+#options RF_INCLUDE_INTERDECLUSTER=1
+#options RF_INCLUDE_PARITY_DECLUSTERING=1
+#options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
+
pseudo-device md 1 # memory disk device (ramdisk)
pseudo-device vnd 4 # disk-like interface to files
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Sun Feb 24 00:17:40 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_LAPTOP,v 1.8.2.10 2002/01/28 04:21:36 sommerfeld Exp $
+# $NetBSD: GENERIC_LAPTOP,v 1.8.2.11 2002/02/24 00:17:42 sommerfeld Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
#
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -6,7 +6,7 @@
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.8.2.10 $"
+#ident "GENERIC-$Revision: 1.8.2.11 $"
maxusers 32 # estimated number of users
@@ -270,6 +270,7 @@
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
+pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
@@ -499,7 +500,7 @@
# MII/PHY support
dmphy* at mii? phy ? # Davicom DM9101 PHYs
exphy* at mii? phy ? # 3Com internal PHYs
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/conf/INSTALL Sun Feb 24 00:17:40 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.135.2.17 2002/01/28 04:21:36 sommerfeld Exp $
+# $NetBSD: INSTALL,v 1.135.2.18 2002/02/24 00:17:43 sommerfeld Exp $
#
# INSTALL - Installation kernel.
#
@@ -200,6 +200,7 @@
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
+pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
@@ -546,7 +547,7 @@
exphy* at mii? phy ? # 3Com internal PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
gphyter* at mii? phy ? # NS83861 Gig-E PHY
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/conf/IOPENER
--- a/sys/arch/i386/conf/IOPENER Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/conf/IOPENER Sun Feb 24 00:17:40 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IOPENER,v 1.11.4.7 2002/01/28 04:21:37 sommerfeld Exp $
+# $NetBSD: IOPENER,v 1.11.4.8 2002/02/24 00:17:43 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.7 $"
+#ident "IOPENER-$Revision: 1.11.4.8 $"
maxusers 32 # estimated number of users
@@ -274,7 +274,7 @@
# MII/PHY support
exphy* at mii? phy ? # 3Com internal PHYs
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/conf/MINBAR
--- a/sys/arch/i386/conf/MINBAR Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/conf/MINBAR Sun Feb 24 00:17:40 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MINBAR,v 1.20.2.7 2002/01/28 04:21:37 sommerfeld Exp $
+# $NetBSD: MINBAR,v 1.20.2.8 2002/02/24 00:17:43 sommerfeld Exp $
# From: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp
#
# MINBAR -- offshore CVS server
@@ -461,7 +461,7 @@
# MII/PHY support
#exphy* at mii? phy ? # 3Com internal PHYs
-#icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
+#icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
#lxtphy* at mii? phy ? # Level One LXT-970 PHYs
#nsphy* at mii? phy ? # NS83840 PHYs
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386 Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/conf/files.i386 Sun Feb 24 00:17:40 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.147.2.21 2002/01/28 04:21:37 sommerfeld Exp $
+# $NetBSD: files.i386,v 1.147.2.22 2002/02/24 00:17:44 sommerfeld Exp $
#
# new style config file for i386 architecture
#
@@ -200,12 +200,7 @@
file arch/i386/pci/pcmb.c pcmb
# Game adapter (joystick)
-device joy
-file arch/i386/isa/joy.c joy needs-flag
-
-# PCI joysticks
-attach joy at pci with pci_joy
-file arch/i386/pci/joy_pci.c pci_joy
+file arch/i386/isa/joy_timer.c joy
#
# ISA and mixed ISA+EISA or ISA+PCI drivers
@@ -284,9 +279,6 @@
attach fd at fdc
major {fd = 2}
-attach joy at isa with joy_isa
-file arch/i386/isa/joy_isa.c joy_isa
-
# Adaptec AHA-284x VL SCSI controllers
# device declaration in sys/conf/files
attach ahc at isa with ahc_isa: ahc_aic77xx, smc93cx6
@@ -312,9 +304,6 @@
# ISA Plug 'n Play devices
file arch/i386/isa/isapnp_machdep.c isapnp
-attach joy at isapnp with joy_isapnp
-file arch/i386/isa/joy_isapnp.c joy_isapnp
-
#
# VME support
#
diff -r acde3d6b16b0 -r 972ea6931653 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c Wed Feb 20 03:00:28 2002 +0000
+++ b/sys/arch/i386/i386/machdep.c Sun Feb 24 00:17:40 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.376.2.32 2002/01/28 04:21:38 sommerfeld Exp $ */
+/* $NetBSD: machdep.c,v 1.376.2.33 2002/02/24 00:17:44 sommerfeld Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.376.2.32 2002/01/28 04:21:38 sommerfeld Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.376.2.33 2002/02/24 00:17:44 sommerfeld Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -1174,7 +1174,7 @@
#define MSR_TMx86_LONGRUN 0x80868010
#define MSR_TMx86_LONGRUN_FLAGS 0x80868011
-#define LONGRUN_MODE_MASK(x) ((x) & 0x000000007f)
+#define LONGRUN_MODE_MASK(x) ((x) & 0x0000007f)
#define LONGRUN_MODE_RESERVED(x) ((x) & 0xffffff80)
#define LONGRUN_MODE_WRITE(x, y) (LONGRUN_MODE_RESERVED(x) | \
LONGRUN_MODE_MASK(y))
@@ -1549,6 +1549,11 @@
cai->cai_associativity = 0; /* XXX Unknown/reserved */
}
+static const char n_support[] =
+ "NOTICE: this kernel does not support %s CPU class\n";
+static const char n_lower[] = "NOTICE: lowering CPU class to %s\n";
+
+
/*
* Print identification for the given CPU.
*/
@@ -1733,34 +1738,34 @@
#endif
#ifndef I686_CPU
case CPUCLASS_686:
- printf("NOTICE: this kernel does not support Pentium Pro CPU class\n");
+ printf(n_support, "Pentium Pro");
Home |
Main Index |
Thread Index |
Old Index