aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/time_32.c
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-07-11 12:45:46 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-13 04:21:23 -0400
commitcf4cfb225ab2b48611cb4f9e8db23c87486416d6 (patch)
tree25caceae9e6f387026f3798b277a99b2cae691b7 /arch/x86/kernel/time_32.c
parentbd32a8cfa8f172bd943655a3663d8005e5c1d83c (diff)
x86: use user_mode macro
Instead of using SEGMENT_IS_KERNEL_CODE, use the "user_mode" macro, which can play the same role. Delete the former, since it now lacks any user. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/time_32.c')
-rw-r--r--arch/x86/kernel/time_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
index bbecf8b6bf96..8abcb7b08694 100644
--- a/arch/x86/kernel/time_32.c
+++ b/arch/x86/kernel/time_32.c
@@ -47,7 +47,7 @@ unsigned long profile_pc(struct pt_regs *regs)
47 unsigned long pc = instruction_pointer(regs); 47 unsigned long pc = instruction_pointer(regs);
48 48
49#ifdef CONFIG_SMP 49#ifdef CONFIG_SMP
50 if (!v8086_mode(regs) && SEGMENT_IS_KERNEL_CODE(regs->cs) && 50 if (!v8086_mode(regs) && !user_mode(regs) &&
51 in_lock_functions(pc)) { 51 in_lock_functions(pc)) {
52#ifdef CONFIG_FRAME_POINTER 52#ifdef CONFIG_FRAME_POINTER
53 return *(unsigned long *)(regs->bp + 4); 53 return *(unsigned long *)(regs->bp + 4);