diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:03:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 10:03:53 +0100 |
| commit | 4040068dce64f75c9d414f41fc2fb314a44bad65 (patch) | |
| tree | 10c4e51ddf9fb33112b773e56905d189909e35b0 /arch/x86/kernel/ftrace.c | |
| parent | d524e03207591a6de7e6b5069aabc778e3f0f5f8 (diff) | |
| parent | c3706f005c3aaf570e71f0f083fdbb59a5a9fa2e (diff) | |
| download | linux-stable-4040068dce64f75c9d414f41fc2fb314a44bad65.tar.gz linux-stable-4040068dce64f75c9d414f41fc2fb314a44bad65.tar.bz2 linux-stable-4040068dce64f75c9d414f41fc2fb314a44bad65.zip | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index f20f49f7d244..2f9c0c8cb4c7 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -468,8 +468,8 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) * ignore such a protection. */ asm volatile( - "1: " _ASM_MOV " (%[parent_old]), %[old]\n" - "2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n" + "1: " _ASM_MOV " (%[parent]), %[old]\n" + "2: " _ASM_MOV " %[return_hooker], (%[parent])\n" " movl $0, %[faulted]\n" "3:\n" @@ -481,9 +481,8 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) _ASM_EXTABLE(1b, 4b) _ASM_EXTABLE(2b, 4b) - : [parent_replaced] "=r" (parent), [old] "=r" (old), - [faulted] "=r" (faulted) - : [parent_old] "0" (parent), [return_hooker] "r" (return_hooker) + : [old] "=r" (old), [faulted] "=r" (faulted) + : [parent] "r" (parent), [return_hooker] "r" (return_hooker) : "memory" ); |