summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-12-02 15:34:09 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-03 08:56:22 +0100
commitbb4304c71c97bf727ec43cd2f195c2c237c27fd3 (patch)
tree91de689ca21951fd49935798fb19148763e3424f /arch/x86
parent347fdd9dd4e5d3f3a4e415925c35bdff1d59c3a9 (diff)
downloadop-kernel-dev-bb4304c71c97bf727ec43cd2f195c2c237c27fd3.zip
op-kernel-dev-bb4304c71c97bf727ec43cd2f195c2c237c27fd3.tar.gz
ftrace: have function graph use mcount caller address
Impact: consistency change for function graph This patch makes function graph record the mcount caller address the same way the function tracer does. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/entry_32.S1
-rw-r--r--arch/x86/kernel/entry_64.S1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 958af86..826682a 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1230,6 +1230,7 @@ ENTRY(ftrace_graph_caller)
pushl %edx
movl 0xc(%esp), %edx
lea 0x4(%ebp), %eax
+ subl $MCOUNT_INSN_SIZE, %edx
call prepare_ftrace_return
popl %edx
popl %ecx
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 2aa0526..9060ba6 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -173,6 +173,7 @@ ENTRY(ftrace_graph_caller)
leaq 8(%rbp), %rdi
movq 0x38(%rsp), %rsi
+ subq $MCOUNT_INSN_SIZE, %rsi
call prepare_ftrace_return
OpenPOWER on IntegriCloud