lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftrace: clean up function graph asm

Browse Source 
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: Steven Rostedt <srostedt@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Steven Rostedt
2008-12-02 15:34:08 -05:00
committed by Ingo Molnar
parent 8789a9e7df
commit 347fdd9dd4
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/kernel/ftrace.c
View File

@@ -467,28 +467,16 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
* ignore such a protection. * ignore such a protection.
*/ */
asm volatile( asm volatile(
#ifdef CONFIG_X86_64 "1: " _ASM_MOV " (%[parent_old]), %[old]\n"
"1: movq (%[parent_old]), %[old]\n" "2: " _ASM_MOV " %[return_hooker], (%[parent_replaced])\n"
"2: movq %[return_hooker], (%[parent_replaced])\n"
#else
"1: movl (%[parent_old]), %[old]\n"
"2: movl %[return_hooker], (%[parent_replaced])\n"
#endif
" movl $0, %[faulted]\n" " movl $0, %[faulted]\n"
".section .fixup, \"ax\"\n" ".section .fixup, \"ax\"\n"
"3: movl $1, %[faulted]\n" "3: movl $1, %[faulted]\n"
".previous\n" ".previous\n"
".section __ex_table, \"a\"\n" _ASM_EXTABLE(1b, 3b)
#ifdef CONFIG_X86_64 _ASM_EXTABLE(2b, 3b)
" .quad 1b, 3b\n"
" .quad 2b, 3b\n"
#else
" .long 1b, 3b\n"
" .long 2b, 3b\n"
#endif
".previous\n"
: [parent_replaced] "=r" (parent), [old] "=r" (old), : [parent_replaced] "=r" (parent), [old] "=r" (old),
[faulted] "=r" (faulted) [faulted] "=r" (faulted)