Skip to content

Commit a9a0580

Browse files
linuswRussell King (Oracle)
authored and
Russell King (Oracle)
committed
ARM: 9382/1: ftrace: Define ftrace_stub_graph
Several architectures defines this stub for the graph tracer, and it is needed for CFI, as it needs a separate symbol for it. The trick from include/asm-generic/vmlinux.lds.h to define ftrace_stub_graph to ftrace_stub isn't working when using CFI. Commit 883bbbf contains the details. Tested-by: Kees Cook <keescook@chromium.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
1 parent 7af5b90 commit a9a0580

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm/kernel/entry-ftrace.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,10 @@ ENTRY(ftrace_stub)
271271
ret lr
272272
ENDPROC(ftrace_stub)
273273

274+
ENTRY(ftrace_stub_graph)
275+
ret lr
276+
ENDPROC(ftrace_stub_graph)
277+
274278
#ifdef CONFIG_DYNAMIC_FTRACE
275279

276280
__INIT

0 commit comments

Comments
 (0)