Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-20 10:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: head_64.S - use GLOBAL macro

Browse Source 
Impact: cleanup

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: heukelum@fastmail.fm
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov 2009-02-23 22:57:01 +03:00 committed by Ingo Molnar
parent b3baaa138c
commit bc8b2b9258
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/x86/kernel/entry_64.S
View File

@ -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 GLOBAL(ftrace_call)
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 GLOBAL(ftrace_graph_call)
ftrace_graph_call:
jmp ftrace_stub jmp ftrace_stub
#endif #endif
.globl ftrace_stub GLOBAL(ftrace_stub)
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 GLOBAL(ftrace_stub)
ftrace_stub:
retq retq
trace: trace:
@ -148,9 +144,7 @@ ENTRY(ftrace_graph_caller)
retq retq
END(ftrace_graph_caller) END(ftrace_graph_caller)
GLOBAL(return_to_handler)
.globl return_to_handler
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 GLOBAL(int_ret_from_sys_call)
.globl int_with_check
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