Commit 2bf3e2ef authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Alexei Starovoitov
Browse files

samples: bpf: include bpf/bpf.h instead of local libbpf.h 



There are two files in the tree called libbpf.h which is becoming
problematic.  Most samples don't actually need the local libbpf.h
they simply include it to get to bpf/bpf.h.  Include bpf/bpf.h
directly instead.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent fb40c9dd

samples/bpf/bpf_load.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <poll.h>

#include <ctype.h>

#include <assert.h>

#include "libbpf.h"

#include <bpf/bpf.h>

#include "bpf_load.h"

#include "perf-sys.h"

samples/bpf/bpf_load.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef __BPF_LOAD_H

#define __BPF_LOAD_H



#include "libbpf.h"

#include <bpf/bpf.h>



#define MAX_MAPS 32

#define MAX_PROGS 32

samples/bpf/cpustat_user.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <sys/resource.h>

#include <sys/wait.h>



#include "libbpf.h"

#include <bpf/bpf.h>

#include "bpf_load.h"



#define MAX_CPU			8

samples/bpf/lathist_user.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <stdlib.h>

#include <signal.h>

#include <linux/bpf.h>

#include "libbpf.h"

#include <bpf/bpf.h>

#include "bpf_load.h"



#define MAX_ENTRIES	20

samples/bpf/load_sock_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <stdlib.h>

#include <string.h>

#include <linux/bpf.h>

#include "libbpf.h"

#include <bpf/bpf.h>

#include "bpf_load.h"

#include <unistd.h>

#include <errno.h>