diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-11 09:49:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 09:49:01 +0100 |
| commit | 7d6d49b1f5551b87bd59c66c10747b89367760fd (patch) | |
| tree | 26a5cd89d950ce8900e2a36dd4ca3da0d7240641 /arch | |
| parent | profiling: fix broken profiling regression (diff) | |
| parent | tracing, x86: fix fixup section to return to original code (diff) | |
| download | linux-dev-7d6d49b1f5551b87bd59c66c10747b89367760fd.tar.xz linux-dev-7d6d49b1f5551b87bd59c66c10747b89367760fd.zip | |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 1b43086b097a..9d549e4fe880 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -491,13 +491,15 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) "1: " _ASM_MOV " (%[parent_old]), %[old]\n" "2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n" " movl $0, %[faulted]\n" + "3:\n" ".section .fixup, \"ax\"\n" - "3: movl $1, %[faulted]\n" + "4: movl $1, %[faulted]\n" + " jmp 3b\n" ".previous\n" - _ASM_EXTABLE(1b, 3b) - _ASM_EXTABLE(2b, 3b) + _ASM_EXTABLE(1b, 4b) + _ASM_EXTABLE(2b, 4b) : [parent_replaced] "=r" (parent), [old] "=r" (old), [faulted] "=r" (faulted) |