Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d6d49b1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/tracing/urgent' of... 

Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
parents acd89579 e3944bfa

arch/x86/kernel/ftrace.c

+5 −3
Original line number Diff line number Diff line
@@ -491,13 +491,15 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
		"1: " _ASM_MOV " (%[parent_old]), %[old]\n"

		"2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\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)