diff options
| author | Josh Poimboeuf <jpoimboe@redhat.com> | 2018-01-27 20:21:50 -0600 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-01-28 09:19:12 +0100 |
| commit | dd085168a74c99c3ebe7f813069e412eb8444243 (patch) | |
| tree | d692e5dd3017f52c1b639301e3f3e89243ff051a | |
| parent | 8a95b74d50825067fb6c8af7f9db03e711b1cb9d (diff) | |
| download | lwn-dd085168a74c99c3ebe7f813069e412eb8444243.tar.gz lwn-dd085168a74c99c3ebe7f813069e412eb8444243.zip | |
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
| -rw-r--r-- | arch/x86/kernel/ftrace_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index 7cb8ba08beb9..8774fd2ed390 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 |