git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kprobes: Cleanup fix_riprel() using insn decoder on x86
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
entry_32.S
diff --git
a/arch/x86/kernel/entry_32.S
b/arch/x86/kernel/entry_32.S
index
9f8ce77
..
c097e7d
100644
(file)
--- a/
arch/x86/kernel/entry_32.S
+++ b/
arch/x86/kernel/entry_32.S
@@
-1174,6
+1174,7
@@
ENTRY(ftrace_graph_caller)
pushl %edx
movl 0xc(%esp), %edx
lea 0x4(%ebp), %eax
pushl %edx
movl 0xc(%esp), %edx
lea 0x4(%ebp), %eax
+ movl (%ebp), %ecx
subl $MCOUNT_INSN_SIZE, %edx
call prepare_ftrace_return
popl %edx
subl $MCOUNT_INSN_SIZE, %edx
call prepare_ftrace_return
popl %edx
@@
-1188,6
+1189,7
@@
return_to_handler:
pushl %eax
pushl %ecx
pushl %edx
pushl %eax
pushl %ecx
pushl %edx
+ movl %ebp, %eax
call ftrace_return_to_handler
movl %eax, 0xc(%esp)
popl %edx
call ftrace_return_to_handler
movl %eax, 0xc(%esp)
popl %edx