diff options
| author | Mark Wielaard <[email protected]> | 2017-08-03 12:37:37 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2017-08-03 14:21:08 +0200 |
| commit | 766df1e15c1e8f8bc9890e7538eb2ef15a6516dc (patch) | |
| tree | 45ae9d0ac821a15fbb9336909671e18efc15f6e8 /libcpu/bpf_disasm.c | |
| parent | 13c3e00ba629586ae42c316ae4ed6c3f04282a82 (diff) | |
| parent | 54ba4ce2973113d8f4315d4fc90e16a9b4476ea6 (diff) | |
Merge tag 'elfutils-0.170' into mjw/RH-DTSdts-0.170
elfutils 0.170 release
Conflicts:
libcpu/Makefile.am
libdw/Makefile.am
tests/Makefile.am
Diffstat (limited to 'libcpu/bpf_disasm.c')
| -rw-r--r-- | libcpu/bpf_disasm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libcpu/bpf_disasm.c b/libcpu/bpf_disasm.c index e4bbae4a..054aba2b 100644 --- a/libcpu/bpf_disasm.c +++ b/libcpu/bpf_disasm.c @@ -35,16 +35,11 @@ #include <stdio.h> #include <gelf.h> #include <inttypes.h> -#include <linux/bpf.h> +#include "bpf.h" #include "../libelf/common.h" #include "../libebl/libeblP.h" -/* BPF_PSEUDO_MAP_FD was only introduced in linux 3.20. */ -#ifndef BPF_PSEUDO_MAP_FD - #define BPF_PSEUDO_MAP_FD 1 -#endif - static const char class_string[8][8] = { [BPF_LD] = "ld", [BPF_LDX] = "ldx", |