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

Commit 347fdd9d authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

ftrace: clean up function graph asm 



Impact: clean up

There exists macros for x86 asm to handle x86_64 and i386.
This patch updates function graph asm to use them.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8789a9e7

arch/x86/kernel/ftrace.c

+4 −16
Original line number Diff line number Diff line
@@ -467,28 +467,16 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
	 * ignore such a protection.

	 */

	asm volatile(

#ifdef CONFIG_X86_64

		"1: movq (%[parent_old]), %[old]\n"

		"2: movq %[return_hooker], (%[parent_replaced])\n"

#else

		"1: movl (%[parent_old]), %[old]\n"

		"2: movl %[return_hooker], (%[parent_replaced])\n"

#endif

		"1: " _ASM_MOV " (%[parent_old]), %[old]\n"

		"2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n"

		"   movl $0, %[faulted]\n"



		".section .fixup, \"ax\"\n"

		"3: movl $1, %[faulted]\n"

		".previous\n"



		".section __ex_table, \"a\"\n"

#ifdef CONFIG_X86_64

		"   .quad 1b, 3b\n"

		"   .quad 2b, 3b\n"

#else

		"   .long 1b, 3b\n"

		"   .long 2b, 3b\n"

#endif

		".previous\n"

		_ASM_EXTABLE(1b, 3b)

		_ASM_EXTABLE(2b, 3b)



		: [parent_replaced] "=r" (parent), [old] "=r" (old),

		  [faulted] "=r" (faulted)