summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/ftrace.c
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-05-12 23:20:56 +0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 23:16:12 +0400
commita56be3fe2f65f9f776e727bfd382e35db75911d6 (patch)
tree579795a68c30f43fac3963f300071ece10291c9c /arch/x86/kernel/ftrace.c
parent30afdcb1de0a37a2086145a82ca3febebe47d019 (diff)
downloadlinux-a56be3fe2f65f9f776e727bfd382e35db75911d6.tar.xz
ftrace: fix the fault label in updating code
The fault label to jump to on fault of updating the code was misplaced preventing the fault from being recorded. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
-rw-r--r--arch/x86/kernel/ftrace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 9f44623e0072..498608c015fb 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -93,8 +93,8 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
" movb %b4, 4(%2)\n"
"2:\n"
".section .fixup, \"ax\"\n"
- " movl $1, %0\n"
- "3: jmp 2b\n"
+ "3: movl $1, %0\n"
+ " jmp 2b\n"
".previous\n"
_ASM_EXTABLE(1b, 3b)
: "=r"(faulted), "=a"(replaced)