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_64.S | |
| parent | 9bf4e7fba8006d19846fec877b6da0616b2772de (diff) | |
| parent | 6beba7adbe092e63dfe8d09fbd1e3ec140474a13 (diff) | |
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_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 42a0b2cbf2e1..722df1b1152d 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -155,11 +155,11 @@ GLOBAL(return_to_handler) call ftrace_return_to_handler - movq %rax, 16(%rsp) + movq %rax, %rdi movq 8(%rsp), %rdx movq (%rsp), %rax - addq $16, %rsp - retq + addq $24, %rsp + jmp *%rdi #endif |