diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-23 08:23:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-23 08:23:20 +0200 |
| commit | 43315956509ca6913764861ac7dec128b91eb1ec (patch) | |
| tree | 60fd5647f150a46e63093a41417c2eef3e776b3d /arch/x86/kernel/entry_32.S | |
| parent | x86, instruction decoder: Fix test_get_len build rules (diff) | |
| parent | perf tools: Unify debug messages mechanisms (diff) | |
| download | linux-43315956509ca6913764861ac7dec128b91eb1ec.tar.xz linux-43315956509ca6913764861ac7dec128b91eb1ec.zip | |
Merge branch 'perf/core' into perf/probes
Conflicts:
tools/perf/Makefile
Merge reason:
- fix the conflict
- pick up the pr_*() infrastructure to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
| -rw-r--r-- | arch/x86/kernel/entry_32.S | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index beb30da203d6..50b9c220e121 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S @@ -1209,17 +1209,14 @@ END(ftrace_graph_caller) .globl return_to_handler return_to_handler: - pushl $0 pushl %eax - pushl %ecx pushl %edx movl %ebp, %eax call ftrace_return_to_handler - movl %eax, 0xc(%esp) + movl %eax, %ecx popl %edx - popl %ecx popl %eax - ret + jmp *%ecx #endif .section .rodata,"a" |