Messages in this thread Patch in this message |  | | Date | Sun, 28 Jan 2018 00:22:03 -0800 | From | tip-bot for Josh Poimboeuf <> | Subject | [tip:x86/urgent] x86/ftrace: Add one more ENDPROC annotation |
| |
Commit-ID: dd085168a74c99c3ebe7f813069e412eb8444243 Gitweb: https://git.kernel.org/tip/dd085168a74c99c3ebe7f813069e412eb8444243 Author: Josh Poimboeuf <jpoimboe@redhat.com> AuthorDate: Sat, 27 Jan 2018 20:21:50 -0600 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Sun, 28 Jan 2018 09:19:12 +0100
x86/ftrace: Add one more ENDPROC annotation
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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index 7cb8ba0..8774fd2 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -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
|  |