Merge branch 'linus' into timers/core

Reason: Further posix_cpu_timer patches depend on mainline changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

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,
                 "    movne  %0, #2    \n"
                 "3:\n"
 
-                ".section .fixup, \"ax\"\n"
+                ".pushsection .fixup, \"ax\"\n"
                 "4:  mov  %0, #1  \n"
                 "    b    3b      \n"
-                ".previous\n"
+                ".popsection\n"
 
-                ".section __ex_table, \"a\"\n"
+                ".pushsection __ex_table, \"a\"\n"
                 "    .long 1b, 4b \n"
                 "    .long 2b, 4b \n"
-                ".previous\n"
+                ".popsection\n"
 
                 : "=r"(err), "=r"(replaced)
                 : "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced)