From: Zachary Amsden <zach@vmware.com>

Never allow int3 traps from V8086 mode to enter the kprobes handler.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Cc: Prasanna S Panchamukhi <prasanna@in.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/kprobes.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/i386/kernel/kprobes.c~i386-dont-try-kprobes-for-v8086-mode arch/i386/kernel/kprobes.c
--- 25/arch/i386/kernel/kprobes.c~i386-dont-try-kprobes-for-v8086-mode	Wed May 31 14:21:28 2006
+++ 25-akpm/arch/i386/kernel/kprobes.c	Wed May 31 14:21:28 2006
@@ -652,7 +652,7 @@ int __kprobes kprobe_exceptions_notify(s
 	struct die_args *args = (struct die_args *)data;
 	int ret = NOTIFY_DONE;
 
-	if (args->regs && user_mode(args->regs))
+	if (args->regs && user_mode_vm(args->regs))
 		return ret;
 
 	switch (val) {
_