From 8980b6d9460ce324ab59ecc51772457f4bf06c6f Mon Sep 17 00:00:00 2001
From: Zachary Amsden <zach@vmware.com>
Date: Fri, 23 Jun 2006 02:04:30 -0700
Subject: [PATCH] --- yaml --- r: 28994 b: refs/heads/master c:
 6444541671bd821b950dbaafee70d65188198aa6 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/i386/kernel/kprobes.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cc9cc9934f17..87a59c27a8c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19964fecf25c17f865dec07ae242b1a40ea93f16
+refs/heads/master: 6444541671bd821b950dbaafee70d65188198aa6
diff --git a/trunk/arch/i386/kernel/kprobes.c b/trunk/arch/i386/kernel/kprobes.c
index 38806f427849..395a9a6dff88 100644
--- a/trunk/arch/i386/kernel/kprobes.c
+++ b/trunk/arch/i386/kernel/kprobes.c
@@ -607,7 +607,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
 	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) {