aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-07-11 13:48:07 -0300
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:21:25 +0200
commit2c44e66843cd50c5ef4f4271fbd63a4f4bf4d083 (patch)
tree1b626d44a5a120162f9a9941b2fb6fb3e3f8acc7 /arch
parentcf4cfb225ab2b48611cb4f9e8db23c87486416d6 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/time_32.c3
1 files changed, 1 insertions, 2 deletions
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