Skip to content

Commit

Permalink
x86: head_64.S - use GLOBAL macro
Browse files Browse the repository at this point in the history
Impact: cleanup

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: heukelum@fastmail.fm
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Cyrill Gorcunov authored and Ingo Molnar committed Feb 24, 2009
1 parent b3baaa1 commit bc8b2b9
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions arch/x86/kernel/entry_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,17 @@ ENTRY(ftrace_caller)
movq 8(%rbp), %rsi
subq $MCOUNT_INSN_SIZE, %rdi

.globl ftrace_call
ftrace_call:
GLOBAL(ftrace_call)
call ftrace_stub

MCOUNT_RESTORE_FRAME

#ifdef CONFIG_FUNCTION_GRAPH_TRACER
.globl ftrace_graph_call
ftrace_graph_call:
GLOBAL(ftrace_graph_call)
jmp ftrace_stub
#endif

.globl ftrace_stub
ftrace_stub:
GLOBAL(ftrace_stub)
retq
END(ftrace_caller)

Expand All @@ -110,8 +107,7 @@ ENTRY(mcount)
jnz ftrace_graph_caller
#endif

.globl ftrace_stub
ftrace_stub:
GLOBAL(ftrace_stub)
retq

trace:
Expand Down Expand Up @@ -148,9 +144,7 @@ ENTRY(ftrace_graph_caller)
retq
END(ftrace_graph_caller)


.globl return_to_handler
return_to_handler:
GLOBAL(return_to_handler)
subq $80, %rsp

movq %rax, (%rsp)
Expand Down Expand Up @@ -634,16 +628,14 @@ tracesys:
* Syscall return path ending with IRET.
* 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)
TRACE_IRQS_OFF
testl $3,CS-ARGOFFSET(%rsp)
je retint_restore_args
movl $_TIF_ALLWORK_MASK,%edi
/* edi: mask to check */
int_with_check:
GLOBAL(int_with_check)
LOCKDEP_SYS_EXIT_IRQ
GET_THREAD_INFO(%rcx)
movl TI_flags(%rcx),%edx
Expand Down

0 comments on commit bc8b2b9

Please sign in to comment.