x86/ftrace: Add one more ENDPROC annotation
authorJosh Poimboeuf <jpoimboe@redhat.com>
Sun, 28 Jan 2018 02:21:50 +0000 (20:21 -0600)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 28 Jan 2018 08:19:12 +0000 (09:19 +0100)
When ORC support was added for the ftrace_64.S code, an ENDPROC
for function_hook() was missed. This results in the following warning:

  arch/x86/kernel/ftrace_64.o: warning: objtool: .entry.text+0x0: unreachable instruction

Fixes: e2ac83d74a4d ("x86/ftrace: Fix ORC unwinding from ftrace handlers")
Reported-by: Steven Rostedt <rostedt@goodmis.org>
Reported-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lkml.kernel.org/r/20180128022150.dqierscqmt3uwwsr@treble
arch/x86/kernel/ftrace_64.S

index 7cb8ba0..8774fd2 100644 (file)
@@ -291,7 +291,7 @@ trace:
        restore_mcount_regs
 
        jmp fgraph_trace
-END(function_hook)
+ENDPROC(function_hook)
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER