diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-03-08 16:30:34 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-03-15 10:32:38 +0100 |
| commit | 0aec21cfb51bc1856206f312d8c13bf1f368d78e (patch) | |
| tree | 27f8562227aea41fa3c75739c1dfe525df8c8261 /samples/ftrace/ftrace-direct-multi.c | |
| parent | 58912710558889629daae3e0824daacab663bd4a (diff) | |
| download | linux-0aec21cfb51bc1856206f312d8c13bf1f368d78e.tar.bz2 | |
x86/ibt,ftrace: Add ENDBR to samples/ftrace
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20220308154318.523421433@infradead.org
Diffstat (limited to 'samples/ftrace/ftrace-direct-multi.c')
| -rw-r--r-- | samples/ftrace/ftrace-direct-multi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c index 2fafc9afcbf0..41ded7c615c7 100644 --- a/samples/ftrace/ftrace-direct-multi.c +++ b/samples/ftrace/ftrace-direct-multi.c @@ -17,11 +17,14 @@ extern void my_tramp(void *); #ifdef CONFIG_X86_64 +#include <asm/ibt.h> + asm ( " .pushsection .text, \"ax\", @progbits\n" " .type my_tramp, @function\n" " .globl my_tramp\n" " my_tramp:" + ASM_ENDBR " pushq %rbp\n" " movq %rsp, %rbp\n" " pushq %rdi\n" @@ -29,7 +32,7 @@ asm ( " call my_direct_func\n" " popq %rdi\n" " leave\n" -" ret\n" + ASM_RET " .size my_tramp, .-my_tramp\n" " .popsection\n" ); |