x86/asm/32: Add ENDs to some functions and relabel with SYM_CODE_*

[linux-2.6-block.git] / arch / x86 / kernel / ftrace_32.S

diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S
index 219be1309c37d92ac1b20b17c49310174e89c07b..a43ed4c0402dc89ac19fa2698c27eb913565cfcd 100644 (file)
--- a/arch/x86/kernel/ftrace_32.S
+++ b/arch/x86/kernel/ftrace_32.S
@@ -89,7 +89,7 @@ WEAK(ftrace_stub)
        ret
 END(ftrace_caller)
 
-ENTRY(ftrace_regs_caller)
+SYM_CODE_START(ftrace_regs_caller)
        /*
         * We're here from an mcount/fentry CALL, and the stack frame looks like:
         *
@@ -163,6 +163,7 @@ SYM_INNER_LABEL(ftrace_regs_call, SYM_L_GLOBAL)
        popl    %eax
 
        jmp     .Lftrace_ret
+SYM_CODE_END(ftrace_regs_caller)
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 ENTRY(ftrace_graph_caller)