summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-08-09 09:43:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-08-09 09:43:46 -0700
commit146430a0c26eb7b515abb04664e1a516078ec5c2 (patch)
treefb2e101fc6b771bf5d7eb38530d9debb2b62cc50 /include
parentb7768c4881d1b69bd95dad149d3b558c8e7de91a (diff)
parent8c8acb8f26cbde665b233dd1b9bbcbb9b86822dc (diff)
Merge tag 'probes-fixes-v6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull kprobe fixes from Masami Hiramatsu: - Fix misusing str_has_prefix() parameter order to check symbol prefix correctly - bpf: remove unused declaring of bpf_kprobe_override * tag 'probes-fixes-v6.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: kprobes: Fix to check symbol prefixes correctly bpf: kprobe: remove unused declaring of bpf_kprobe_override
Diffstat (limited to 'include')
-rw-r--r--include/linux/trace_events.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index fed58e54f15e..42bedcddd511 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -880,7 +880,6 @@ do { \
struct perf_event;
DECLARE_PER_CPU(struct pt_regs, perf_trace_regs);
-DECLARE_PER_CPU(int, bpf_kprobe_override);
extern int perf_trace_init(struct perf_event *event);
extern void perf_trace_destroy(struct perf_event *event);