diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-14 09:29:52 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 09:29:52 -0400 |
| commit | 23e117fa44429cc054cb27d5621d64e4ced91e52 (patch) | |
| tree | a4b9d0902b9c6f009b2c297515221c1b9bed3af8 /arch/arm/kernel/ftrace.c | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | a93d2f1744206827ccf416e2cdc5018aa503314e (diff) | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4
Diffstat (limited to 'arch/arm/kernel/ftrace.c')
| -rw-r--r-- | arch/arm/kernel/ftrace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index c63842766229..0298286ad4ad 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c | |||
| @@ -62,15 +62,15 @@ int ftrace_modify_code(unsigned long pc, unsigned char *old_code, | |||
| 62 | " movne %0, #2 \n" | 62 | " movne %0, #2 \n" |
| 63 | "3:\n" | 63 | "3:\n" |
| 64 | 64 | ||
| 65 | ".section .fixup, \"ax\"\n" | 65 | ".pushsection .fixup, \"ax\"\n" |
| 66 | "4: mov %0, #1 \n" | 66 | "4: mov %0, #1 \n" |
| 67 | " b 3b \n" | 67 | " b 3b \n" |
| 68 | ".previous\n" | 68 | ".popsection\n" |
| 69 | 69 | ||
| 70 | ".section __ex_table, \"a\"\n" | 70 | ".pushsection __ex_table, \"a\"\n" |
| 71 | " .long 1b, 4b \n" | 71 | " .long 1b, 4b \n" |
| 72 | " .long 2b, 4b \n" | 72 | " .long 2b, 4b \n" |
| 73 | ".previous\n" | 73 | ".popsection\n" |
| 74 | 74 | ||
| 75 | : "=r"(err), "=r"(replaced) | 75 | : "=r"(err), "=r"(replaced) |
| 76 | : "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced) | 76 | : "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced) |