From 90e04470e2642152aac633dad852dd42835eeb45 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Fri, 11 Jul 2008 13:48:07 -0300
Subject: [PATCH] --- yaml --- r: 113525 b: refs/heads/master c:
 2c44e66843cd50c5ef4f4271fbd63a4f4bf4d083 h: refs/heads/master i:   113523:
 1ba03c14ab2f258421b902b1bd5859c1b8f38bea v: v3

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

diff --git a/[refs] b/[refs]
index feb14c744ed0..4bfd76752027 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf4cfb225ab2b48611cb4f9e8db23c87486416d6
+refs/heads/master: 2c44e66843cd50c5ef4f4271fbd63a4f4bf4d083
diff --git a/trunk/arch/x86/kernel/time_32.c b/trunk/arch/x86/kernel/time_32.c
index 8abcb7b08694..ca0a4aab12ce 100644
--- a/trunk/arch/x86/kernel/time_32.c
+++ b/trunk/arch/x86/kernel/time_32.c
@@ -47,8 +47,7 @@ unsigned long profile_pc(struct pt_regs *regs)
 	unsigned long pc = instruction_pointer(regs);
 
 #ifdef CONFIG_SMP
-	if (!v8086_mode(regs) && !user_mode(regs) &&
-	    in_lock_functions(pc)) {
+	if (!user_mode_vm(regs) && in_lock_functions(pc)) {
 #ifdef CONFIG_FRAME_POINTER
 		return *(unsigned long *)(regs->bp + 4);
 #else