|
@@ -77,20 +77,17 @@ ENTRY(ftrace_caller)
|
|
movq 8(%rbp), %rsi
|
|
movq 8(%rbp), %rsi
|
|
subq $MCOUNT_INSN_SIZE, %rdi
|
|
subq $MCOUNT_INSN_SIZE, %rdi
|
|
|
|
|
|
-.globl ftrace_call
|
|
|
|
-ftrace_call:
|
|
|
|
|
|
+GLOBAL(ftrace_call)
|
|
call ftrace_stub
|
|
call ftrace_stub
|
|
|
|
|
|
MCOUNT_RESTORE_FRAME
|
|
MCOUNT_RESTORE_FRAME
|
|
|
|
|
|
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
|
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
|
-.globl ftrace_graph_call
|
|
|
|
-ftrace_graph_call:
|
|
|
|
|
|
+GLOBAL(ftrace_graph_call)
|
|
jmp ftrace_stub
|
|
jmp ftrace_stub
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-.globl ftrace_stub
|
|
|
|
-ftrace_stub:
|
|
|
|
|
|
+GLOBAL(ftrace_stub)
|
|
retq
|
|
retq
|
|
END(ftrace_caller)
|
|
END(ftrace_caller)
|
|
|
|
|
|
@@ -110,8 +107,7 @@ ENTRY(mcount)
|
|
jnz ftrace_graph_caller
|
|
jnz ftrace_graph_caller
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-.globl ftrace_stub
|
|
|
|
-ftrace_stub:
|
|
|
|
|
|
+GLOBAL(ftrace_stub)
|
|
retq
|
|
retq
|
|
|
|
|
|
trace:
|
|
trace:
|
|
@@ -148,9 +144,7 @@ ENTRY(ftrace_graph_caller)
|
|
retq
|
|
retq
|
|
END(ftrace_graph_caller)
|
|
END(ftrace_graph_caller)
|
|
|
|
|
|
-
|
|
|
|
-.globl return_to_handler
|
|
|
|
-return_to_handler:
|
|
|
|
|
|
+GLOBAL(return_to_handler)
|
|
subq $80, %rsp
|
|
subq $80, %rsp
|
|
|
|
|
|
movq %rax, (%rsp)
|
|
movq %rax, (%rsp)
|
|
@@ -634,16 +628,14 @@ tracesys:
|
|
* Syscall return path ending with IRET.
|
|
* Syscall return path ending with IRET.
|
|
* Has correct top of stack, but partial stack frame.
|
|
* Has correct top of stack, but partial stack frame.
|
|
*/
|
|
*/
|
|
- .globl int_ret_from_sys_call
|
|
|
|
- .globl int_with_check
|
|
|
|
-int_ret_from_sys_call:
|
|
|
|
|
|
+GLOBAL(int_ret_from_sys_call)
|
|
DISABLE_INTERRUPTS(CLBR_NONE)
|
|
DISABLE_INTERRUPTS(CLBR_NONE)
|
|
TRACE_IRQS_OFF
|
|
TRACE_IRQS_OFF
|
|
testl $3,CS-ARGOFFSET(%rsp)
|
|
testl $3,CS-ARGOFFSET(%rsp)
|
|
je retint_restore_args
|
|
je retint_restore_args
|
|
movl $_TIF_ALLWORK_MASK,%edi
|
|
movl $_TIF_ALLWORK_MASK,%edi
|
|
/* edi: mask to check */
|
|
/* edi: mask to check */
|
|
-int_with_check:
|
|
|
|
|
|
+GLOBAL(int_with_check)
|
|
LOCKDEP_SYS_EXIT_IRQ
|
|
LOCKDEP_SYS_EXIT_IRQ
|
|
GET_THREAD_INFO(%rcx)
|
|
GET_THREAD_INFO(%rcx)
|
|
movl TI_flags(%rcx),%edx
|
|
movl TI_flags(%rcx),%edx
|