Commit f1b24d8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 7aaa8047 2e8b1a1d

tools/tracing/rtla/src/timerlat_bpf.h

+0 −1
Original line number Diff line number Diff line
@@ -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);