diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-08-10 16:49:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 16:49:46 +0200 |
| commit | 636bf35880e5a79c2ecb10640137bbd9a4681cb7 (patch) | |
| tree | 919ea9ac007b72acb92a99fb7e28c8238a69573f /tools/lib/bpf | |
| parent | x86/platform/intel-mid: Make 'bt_sfi_data' const (diff) | |
| parent | Merge tag 'pinctrl-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl (diff) | |
| download | linux-dev-636bf35880e5a79c2ecb10640137bbd9a4681cb7.tar.xz linux-dev-636bf35880e5a79c2ecb10640137bbd9a4681cb7.zip | |
Merge branch 'linus' into x86/platform, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib/bpf')
| -rw-r--r-- | tools/lib/bpf/bpf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 412a7c82995a..e5bbb090bf88 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -39,6 +39,8 @@ # define __NR_bpf 280 # elif defined(__sparc__) # define __NR_bpf 349 +# elif defined(__s390__) +# define __NR_bpf 351 # else # error __NR_bpf not defined. libbpf does not support your arch. # endif @@ -314,7 +316,6 @@ int bpf_obj_get_info_by_fd(int prog_fd, void *info, __u32 *info_len) int err; bzero(&attr, sizeof(attr)); - bzero(info, *info_len); attr.info.bpf_fd = prog_fd; attr.info.info_len = *info_len; attr.info.info = ptr_to_u64(info); |