Skip to content

Commit dd08516

Browse files
jpoimboeKAGA-KOKO
authored andcommitted
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: e2ac83d ("x86/ftrace: Fix ORC unwinding from ftrace handlers") Reported-by: Steven Rostedt <[email protected]> Reported-by: Borislav Petkov <[email protected]> Signed-off-by: Josh Poimboeuf <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Ingo Molnar <[email protected]> Cc: Linus Torvalds <[email protected]> Link: https://lkml.kernel.org/r/20180128022150.dqierscqmt3uwwsr@treble
1 parent 8a95b74 commit dd08516

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/ftrace_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ trace:
291291
restore_mcount_regs
292292

293293
jmp fgraph_trace
294-
END(function_hook)
294+
ENDPROC(function_hook)
295295
#endif /* CONFIG_DYNAMIC_FTRACE */
296296

297297
#ifdef CONFIG_FUNCTION_GRAPH_TRACER

0 commit comments

Comments
 (0)