From 316100a6d1b982807f2aadf6c10a0a004bc47f34 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Fri, 11 Jul 2008 13:53:43 -0300
Subject: [PATCH] --- yaml --- r: 113527 b: refs/heads/master c:
 3927fa9e4b5d5f346d12aa0531744daef106ebd3 h: refs/heads/master i:   113525:
 90e04470e2642152aac633dad852dd42835eeb45   113523:
 1ba03c14ab2f258421b902b1bd5859c1b8f38bea   113519:
 a1b87070a087305032c4195af43608f4d74b9558 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/time_64.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b044305a974..6a58d7742931 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 097a0788df71b0f3328c70ab5f4e41c27ee66817
+refs/heads/master: 3927fa9e4b5d5f346d12aa0531744daef106ebd3
diff --git a/trunk/arch/x86/kernel/time_64.c b/trunk/arch/x86/kernel/time_64.c
index e3d49c553af2..7fd995edb762 100644
--- a/trunk/arch/x86/kernel/time_64.c
+++ b/trunk/arch/x86/kernel/time_64.c
@@ -34,11 +34,15 @@ unsigned long profile_pc(struct pt_regs *regs)
 	   of flags from PUSHF
 	   Eflags always has bits 22 and up cleared unlike kernel addresses. */
 	if (!user_mode(regs) && in_lock_functions(pc)) {
+#ifdef CONFIG_FRAME_POINTER
+		return *(unsigned long *)(regs->bp + sizeof(long));
+#else
 		unsigned long *sp = (unsigned long *)regs->sp;
 		if (sp[0] >> 22)
 			return sp[0];
 		if (sp[1] >> 22)
 			return sp[1];
+#endif
 	}
 	return pc;
 }