From: Glauber Costa <gcosta@redhat.com>
Date: Fri, 11 Jul 2008 16:48:07 +0000 (-0300)
Subject: x86: coalesce tests
X-Git-Tag: v2.6.28-rc1~611^2~57
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2c44e66843cd50c5ef4f4271fbd63a4f4bf4d083;p=linux-2.6-omap-h63xx.git

x86: coalesce tests

Coalesce v8086_mode and user_mode into a single
user_mode_vm() test.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
index 8abcb7b0869..ca0a4aab12c 100644
--- a/arch/x86/kernel/time_32.c
+++ b/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