diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/arm/kernel/ftrace.c | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
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) |