aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/samples/ftrace/ftrace-direct.c
diff options
context:
space:
mode:
authorSong Shuai <suagrfillet@gmail.com>2023-01-30 16:59:54 +0800
committerSteven Rostedt (Google) <rostedt@goodmis.org>2023-02-07 12:44:39 -0500
commit01678fbce3dd2e3042077cf71b68157e733614a0 (patch)
tree2858675dc8038423237158bfac5701026eab37cf /samples/ftrace/ftrace-direct.c
parenttracing: Acquire buffer from temparary trace sequence (diff)
downloadwireguard-linux-01678fbce3dd2e3042077cf71b68157e733614a0.tar.xz
wireguard-linux-01678fbce3dd2e3042077cf71b68157e733614a0.zip
samples: ftrace: Include the nospec-branch.h only for x86
When other architectures without the nospec functionality write their direct-call functions of samples/ftrace/*.c, the including of asm/nospec-branch.h must be taken care to fix the no header file found error in building process. This commit (ee3e2469b346 "x86/ftrace: Make it call depth tracking aware") file-globally includes asm/nospec-branch.h providing CALL_DEPTH_ACCOUNT for only x86 direct-call functions. It seems better to move the including to `#ifdef CONFIG_X86_64`. Link: https://lore.kernel.org/linux-trace-kernel/20230130085954.647845-1-suagrfillet@gmail.com Signed-off-by: Song Shuai <suagrfillet@gmail.com> Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Diffstat (limited to 'samples/ftrace/ftrace-direct.c')
-rw-r--r--samples/ftrace/ftrace-direct.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c
index 1f769d0db20f..1d3d307ca33d 100644
--- a/samples/ftrace/ftrace-direct.c
+++ b/samples/ftrace/ftrace-direct.c
@@ -4,7 +4,6 @@
#include <linux/sched.h> /* for wake_up_process() */
#include <linux/ftrace.h>
#include <asm/asm-offsets.h>
-#include <asm/nospec-branch.h>
extern void my_direct_func(struct task_struct *p);
@@ -18,6 +17,7 @@ extern void my_tramp(void *);
#ifdef CONFIG_X86_64
#include <asm/ibt.h>
+#include <asm/nospec-branch.h>
asm (
" .pushsection .text, \"ax\", @progbits\n"