---

yaml --- r: 113529 b: refs/heads/master c: 8de0b8a h: refs/heads/master i: 113527: 316100a v: v3
git-mirror · Oct 13, 2008 · f61bf73 · f61bf73
1 parent f0d3e20
commit f61bf73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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