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

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

details:   https://anonhg.NetBSD.org/src/rev/004e4e894f35
branches:  netbsd-6-0
changeset: 775272:004e4e894f35
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Oct 13 08:03:00 2017 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1505):
        sys/arch/i386/i386/i386_trap.S: revision 1.12 via patch
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.
As I said earlier, this dtrace code is complete bullshit.

diffstat:

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

diffs (27 lines):

diff -r 7b0e6050e5cc -r 004e4e894f35 sys/arch/i386/i386/vector.S
--- a/sys/arch/i386/i386/vector.S       Mon Sep 11 04:46:47 2017 +0000
+++ b/sys/arch/i386/i386/vector.S       Fri Oct 13 08:03:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vector.S,v 1.59 2011/06/12 03:35:42 rmind Exp $        */
+/*     $NetBSD: vector.S,v 1.59.12.1 2017/10/13 08:03:00 snj Exp $     */
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.59 2011/06/12 03:35:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.59.12.1 2017/10/13 08:03:00 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -773,7 +773,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. */