projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'input-for-v6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
kernel
/
trace
/
bpf_trace.c
diff --git
a/kernel/trace/bpf_trace.c
b/kernel/trace/bpf_trace.c
index 6249dac61701834be8a6b8619945560b7bafa8ed..d1daeab1bbc141df37023a2f1c683ec7268b732e 100644
(file)
--- a/
kernel/trace/bpf_trace.c
+++ b/
kernel/trace/bpf_trace.c
@@
-3517,7
+3517,6
@@
static u64 bpf_uprobe_multi_entry_ip(struct bpf_run_ctx *ctx)
}
#endif /* CONFIG_UPROBES */
-#ifdef CONFIG_FPROBE
__bpf_kfunc_start_defs();
__bpf_kfunc bool bpf_session_is_return(void)
@@
-3566,4
+3565,3
@@
static int __init bpf_kprobe_multi_kfuncs_init(void)
}
late_initcall(bpf_kprobe_multi_kfuncs_init);
-#endif