Merge tag 'trace-rtla-v7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

f1b24d8b · Linus Torvalds <[email protected]> · 2026-03-30 13:12:00 -07:00

Pull rtla build fix from Steven Rostedt:

 - Fix build failure when libbpf does not exist

   RTLA supports building without BPF libraries, but a recent change
   added a libbpf.h include outside of the BPF protection which caused
   build failures when libbpf was not installed.

* tag 'trace-rtla-v7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  rtla: Fix build without libbpf header

Commit: f1b24d8bdd64ecd5400dff79677f8a290ca70d73
Parents: 7aaa8047 · 2e8b1a1d

Merge commit. Changes below are compared with the first parent: 7aaa8047.

Changes

1 files changed · +0 −1

File	Status	Add	Del	Content
tools/tracing/rtla/src/timerlat_bpf.h	modified	+0	−1	View file

tools/tracing/rtla/src/timerlat_bpf.h

View file

diff --git a/tools/tracing/rtla/src/timerlat_bpf.h b/tools/tracing/rtla/src/timerlat_bpf.h
index 169abea..f7c5675 100644
--- a/tools/tracing/rtla/src/timerlat_bpf.h
+++ b/tools/tracing/rtla/src/timerlat_bpf.h
@@ -12,7 +12,6 @@ enum summary_field {
 };
 
 #ifndef __bpf__
-#include <bpf/libbpf.h>
 #ifdef HAVE_BPF_SKEL
 int timerlat_bpf_init(struct timerlat_params *params);
 int timerlat_bpf_attach(void);