Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc arch/x86/kernel/ftrace.c
index f20f49f7d2447c35a7ba3db9e350f29d6c07ced0,370bafaa43a37ed741b2e511ec1618afd3bc9684..2f9c0c8cb4c77351af56310a19d60ecb29dea887
--- 1/arch/x86/kernel/ftrace.c
--- 2/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@@ -468,22 -468,19 +468,21 @@@ void prepare_ftrace_return(unsigned lon
         * ignore such a protection.
         */
        asm volatile(
-               "1: " _ASM_MOV " (%[parent_old]), %[old]\n"
-               "2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n"
+               "1: " _ASM_MOV " (%[parent]), %[old]\n"
+               "2: " _ASM_MOV " %[return_hooker], (%[parent])\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)
-               : [parent_old] "0" (parent), [return_hooker] "r" (return_hooker)
+               : [old] "=r" (old), [faulted] "=r" (faulted)
+               : [parent] "r" (parent), [return_hooker] "r" (return_hooker)
                : "memory"
        );