Module Name: src
Committed By: snj
Date: Fri Oct 13 08:03:00 UTC 2017
Modified Files:
src/sys/arch/i386/i386 [netbsd-6-0]: vector.S
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.12.1 src/sys/arch/i386/i386/vector.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/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.59 src/sys/arch/i386/i386/vector.S:1.59.12.1
--- src/sys/arch/i386/i386/vector.S:1.59 Sun Jun 12 03:35:42 2011
+++ src/sys/arch/i386/i386/vector.S Fri Oct 13 08:03:00 2017
@@ -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 @@ IDTVEC(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. */
