diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-13 10:20:59 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-01-13 10:20:59 -0300 |
commit | 1aa77e716c6f2332f2d4664f747ff4eba731825b (patch) | |
tree | bffb043cec73da6c79d4ec652e531f86344b160b /tools/build | |
parent | c0dd94558d0e473aa92254e1c48a47900c911e69 (diff) | |
parent | 455e73a07f6e288b0061dfcf4fcf54fa9fe06458 (diff) | |
download | linux-stable-1aa77e716c6f2332f2d4664f747ff4eba731825b.tar.gz linux-stable-1aa77e716c6f2332f2d4664f747ff4eba731825b.tar.bz2 linux-stable-1aa77e716c6f2332f2d4664f747ff4eba731825b.zip |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get in line with other trees, powerpc kernel
mostly this time, but BPF as well.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/build')
-rw-r--r-- | tools/build/feature/test-bpf.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/build/feature/test-bpf.c b/tools/build/feature/test-bpf.c index 82070eadfc07..727d22e34a6e 100644 --- a/tools/build/feature/test-bpf.c +++ b/tools/build/feature/test-bpf.c @@ -14,6 +14,12 @@ # define __NR_bpf 349 # elif defined(__s390__) # define __NR_bpf 351 +# elif defined(__mips__) && defined(_ABIO32) +# define __NR_bpf 4355 +# elif defined(__mips__) && defined(_ABIN32) +# define __NR_bpf 6319 +# elif defined(__mips__) && defined(_ABI64) +# define __NR_bpf 5315 # else # error __NR_bpf not defined. libbpf does not support your arch. # endif |