From f61bf73d0f1ea208cc1d81d81164f1a1bae6f53b Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Fri, 11 Jul 2008 14:10:13 -0300 Subject: [PATCH] --- yaml --- r: 113529 b: refs/heads/master c: 8de0b8a7eaf274d197698b035090eeb805f62de6 h: refs/heads/master i: 113527: 316100a6d1b982807f2aadf6c10a0a004bc47f34 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/time_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b0513f3cdf10..f0e99b2cb6d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efa323abd424a2450f810b96203c1fbf138998b9 +refs/heads/master: 8de0b8a7eaf274d197698b035090eeb805f62de6 diff --git a/trunk/arch/x86/kernel/time_64.c b/trunk/arch/x86/kernel/time_64.c index 7fd995edb762..0469243ae1bd 100644 --- a/trunk/arch/x86/kernel/time_64.c +++ b/trunk/arch/x86/kernel/time_64.c @@ -33,7 +33,7 @@ unsigned long profile_pc(struct pt_regs *regs) /* Assume the lock function has either no stack frame or a copy of flags from PUSHF Eflags always has bits 22 and up cleared unlike kernel addresses. */ - if (!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 + sizeof(long)); #else