Module Name: src
Committed By: snj
Date: Sun Oct 1 17:01:47 UTC 2017
Modified Files:
src/sys/arch/i386/i386 [netbsd-7]: i386_trap.S
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.6.1 src/sys/arch/i386/i386/i386_trap.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/i386_trap.S
diff -u src/sys/arch/i386/i386/i386_trap.S:1.5 src/sys/arch/i386/i386/i386_trap.S:1.5.6.1
--- src/sys/arch/i386/i386/i386_trap.S:1.5 Wed Feb 12 23:24:09 2014
+++ src/sys/arch/i386/i386/i386_trap.S Sun Oct 1 17:01:47 2017
@@ -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.6.1 2017/10/01 17:01:47 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.6.1 2017/10/01 17:01:47 snj Exp $");
#endif
/*
@@ -119,7 +119,7 @@ IDTVEC_END(trap05)
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. */
