[src/netbsd-7-0]: src/sys/arch/i386/i386 Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/3de2a61c86eb
branches:  netbsd-7-0
changeset: 801393:3de2a61c86eb
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Oct 01 17:01:44 2017 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1512):
        sys/arch/i386/i386/i386_trap.S: revision 1.12
Pfff, use %ss and not %ds. The latter is controlled by userland, the former
contains the kernel value (flat); FreeBSD fixed this too a few weeks ago.

diffstat:

 sys/arch/i386/i386/i386_trap.S |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 6a694e4702e4 -r 3de2a61c86eb sys/arch/i386/i386/i386_trap.S
--- a/sys/arch/i386/i386/i386_trap.S    Sun Sep 24 20:13:59 2017 +0000
+++ b/sys/arch/i386/i386/i386_trap.S    Sun Oct 01 17:01:44 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386_trap.S,v 1.5 2014/02/12 23:24:09 dsl Exp $        */
+/*     $NetBSD: i386_trap.S,v 1.5.12.1 2017/10/01 17:01:44 snj Exp $   */
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
 
 #if 0
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.5 2014/02/12 23:24:09 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.5.12.1 2017/10/01 17:01:44 snj Exp $");
 #endif
 
 /*
@@ -119,7 +119,7 @@
        SUPERALIGN_TEXT
 IDTVEC(trap06)
        /* Check if there is no DTrace hook registered. */
-       cmpl    $0,dtrace_invop_jump_addr
+       cmpl    $0,%ss:dtrace_invop_jump_addr
        je      norm_ill
 
        /* Check if this is a user fault. */