commit 2c44e66843cd50c5ef4f4271fbd63a4f4bf4d083
author Glauber Costa <gcosta@redhat.com> Fri Jul 11 13:48:07 2008 -0300
committer Ingo Molnar <mingo@elte.hu> Mon Oct 13 10:21:25 2008 +0200
tree 1b626d44a5a120162f9a9941b2fb6fb3e3f8acc7
parent cf4cfb225ab2b48611cb4f9e8db23c87486416d6

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>

arch/x86/kernel/time_32.c

diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
index 8abcb7b..ca0a4aa 100644
--- a/arch/x86/kernel/time_32.c
+++ b/arch/x86/kernel/time_32.c
@@ -47,8 +47,7 @@
 	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