[src/netbsd-1-5]: src/sys/arch/i386/i386 Pull up revision 1.446 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/5fc9a36bc8cd
branches:  netbsd-1-5
changeset: 491944:5fc9a36bc8cd
user:      he <he%NetBSD.org@localhost>
date:      Mon Jun 25 16:11:34 2001 +0000

description:
Pull up revision 1.446 (requested by sommerfeld):
  Restore fs and gs from sigcontext in sigreturn; fixes oversight
  in previous pull-up.

diffstat:

 sys/arch/i386/i386/machdep.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 1b5c06903b62 -r 5fc9a36bc8cd sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Mon Jun 25 16:03:09 2001 +0000
+++ b/sys/arch/i386/i386/machdep.c      Mon Jun 25 16:11:34 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.389.2.5 2001/06/17 22:27:03 he Exp $     */
+/*     $NetBSD: machdep.c,v 1.389.2.6 2001/06/25 16:11:34 he Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -1112,7 +1112,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;