From: Glauber Costa <gcosta@redhat.com>
Date: Fri, 11 Jul 2008 16:53:43 +0000 (-0300)
Subject: x86: use frame pointer information on x86_64 profile_pc
X-Git-Tag: v2.6.28-rc1~611^2~55
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3927fa9e4b5d5f346d12aa0531744daef106ebd3;p=linux-2.6-omap-h63xx.git

x86: use frame pointer information on x86_64 profile_pc

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c
index e3d49c553af..7fd995edb76 100644
--- a/arch/x86/kernel/time_64.c
+++ b/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;
 }