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

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

details:   https://anonhg.NetBSD.org/src/rev/335521a5d5da
branches:  netbsd-1-5
changeset: 491893:335521a5d5da
user:      he <he%NetBSD.org@localhost>
date:      Mon Jun 11 20:40:34 2001 +0000

description:
Pull up revision 1.240 (requested by sommerfeld):
  Replace magic numbers in trap code with offsetof().
  Deal better with traps during register restore.
  Explain a bit more about what is going on here.

diffstat:

 sys/arch/i386/i386/locore.s |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r da0a2b9f37e8 -r 335521a5d5da sys/arch/i386/i386/locore.s
--- a/sys/arch/i386/i386/locore.s       Mon Jun 11 20:40:19 2001 +0000
+++ b/sys/arch/i386/i386/locore.s       Mon Jun 11 20:40:34 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.222.2.2 2001/04/25 09:30:42 he Exp $      */
+/*     $NetBSD: locore.s,v 1.222.2.3 2001/06/11 20:40:34 he Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -2319,6 +2319,7 @@
 NENTRY(resume_iret)
        ZTRAP(T_PROTFLT)
 NENTRY(resume_pop_ds)
+       pushl   %es
        movl    $GSEL(GDATA_SEL, SEL_KPL),%eax
        movl    %ax,%es
 NENTRY(resume_pop_es)