[src/sommerfeld_i386mp_1]: src/sys/arch/i386 Merge up with -current.

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a14e289cb11
branches:  sommerfeld_i386mp_1
changeset: 482414:1a14e289cb11
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Jun 24 19:29:49 2001 +0000

description:
Merge up with -current.

diffstat:

 sys/arch/i386/conf/GENERIC   |  9 ++++++---
 sys/arch/i386/conf/INSTALL   |  7 +++++--
 sys/arch/i386/i386/machdep.c |  5 +++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diffs (90 lines):

diff -r fa35b86c900a -r 1a14e289cb11 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Mon Jun 18 04:49:04 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Jun 24 19:29:49 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.300.2.17 2001/06/18 03:33:27 sommerfeld Exp $
+#      $NetBSD: GENERIC,v 1.300.2.18 2001/06/24 19:29:49 sommerfeld Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.300.2.17 $"
+#ident                 "GENERIC-$Revision: 1.300.2.18 $"
 
 maxusers       32              # estimated number of users
 
@@ -559,12 +559,14 @@
 esh*   at pci? dev ? function ?        # Essential HIPPI card
 fpa*   at pci? dev ? function ?        # DEC DEFPA FDDI
 fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
+gsip*  at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 le*    at pci? dev ? function ?        # PCnet-PCI Ethernet
 lmc*   at pci? dev ? function ?        # Lan Media Corp SSI/HSSI/DS3
 ne*    at pci? dev ? function ?        # NE2000-compatible Ethernet
 ntwoc* at pci? dev ? function ?        # Riscom/N2 PCI Sync Serial
 rtk*   at pci? dev ? function ?        # Realtek 8129/8139
-sip*   at pci? dev ? function ?        # SiS 900 Ethernet
+sf*    at pci? dev ? function ?        # Adaptec AIC-6915 Ethernet
+sip*   at pci? dev ? function ?        # SiS 900/DP83815 Ethernet
 ti*    at pci? dev ? function ?        # Alteon ACEnic gigabit Ethernet
 tl*    at pci? dev ? function ?        # ThunderLAN-based Ethernet
 tlp*   at pci? dev ? function ?        # DECchip 21x4x (and clones) Ethernet
@@ -643,6 +645,7 @@
 inphy* at mii? phy ?                   # Intel 82555 PHYs
 iophy* at mii? phy ?                   # Intel 82553 PHYs
 lxtphy*        at mii? phy ?                   # Level One LXT-970 PHYs
+gphyter* at mii? phy ?                 # NS83861 Gig-E PHY
 nsphy* at mii? phy ?                   # NS83840 PHYs
 nsphyter* at mii? phy ?                        # NS83843 PHYs
 qsphy* at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
diff -r fa35b86c900a -r 1a14e289cb11 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Mon Jun 18 04:49:04 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL        Sun Jun 24 19:29:49 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.135.2.11 2001/06/18 03:33:27 sommerfeld Exp $
+#      $NetBSD: INSTALL,v 1.135.2.12 2001/06/24 19:29:50 sommerfeld Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -454,9 +454,11 @@
 esh*   at pci? dev ? function ?        # Essential HIPPI card
 fpa*   at pci? dev ? function ?        # DEC DEFPA FDDI
 fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
+gsip*  at pci? dev ? function ?        # NS83820 Gigabit Ethernet
 le*    at pci? dev ? function ?        # PCnet-PCI Ethernet
 ne*    at pci? dev ? function ?        # NE2000-compatible Ethernet
-sip*   at pci? dev ? function ?        # SiS 900 Ethernet
+sf*    at pci? dev ? function ?        # Adaptec AIC-6915 Ethernet
+sip*   at pci? dev ? function ?        # SiS 900/DP83815 Ethernet
 tl*    at pci? dev ? function ?        # ThunderLAN-based Ethernet
 tlp*   at pci? dev ? function ?        # DECchip 21x4x (and clones) Ethernet
 #options       TLP_MATCH_21040
@@ -526,6 +528,7 @@
 inphy* at mii? phy ?                   # Intel 82555 PHYs
 iophy* at mii? phy ?                   # Intel 82553 PHYs
 lxtphy*        at mii? phy ?                   # Level One LXT-970 PHYs
+gphyter* at mii? phy ?                 # NS83861 Gig-E PHY
 nsphy* at mii? phy ?                   # NS83840 PHYs
 nsphyter* at mii? phy ?                        # NS83843 PHYs
 qsphy* at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
diff -r fa35b86c900a -r 1a14e289cb11 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Mon Jun 18 04:49:04 2001 +0000
+++ b/sys/arch/i386/i386/machdep.c      Sun Jun 24 19:29:49 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.376.2.25 2001/06/18 03:33:29 sommerfeld Exp $    */
+/*     $NetBSD: machdep.c,v 1.376.2.26 2001/06/24 19:29:52 sommerfeld Exp $    */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -1695,7 +1695,8 @@
                    !USERMODE(context.sc_cs, context.sc_eflags))
                        return (EINVAL);
 
-               /* %fs and %gs were restored by the trampoline. */
+               tf->tf_gs = context.sc_gs;
+               tf->tf_fs = context.sc_fs;
                tf->tf_es = context.sc_es;
                tf->tf_ds = context.sc_ds;
                tf->tf_eflags = context.sc_eflags;