diff options
author | Matteo Croce <mcroce@redhat.com> | 2020-05-11 13:32:34 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-03 08:19:31 +0200 |
commit | d0de1cab5a5a9a7103d73888e88056b3e948b275 (patch) | |
tree | bdd988aad69125b58ff0ee70f15ffa08557c7af9 | |
parent | 4d9248f989ecf29a4c3e5c525cccdacb7708e11f (diff) | |
download | linux-stable-d0de1cab5a5a9a7103d73888e88056b3e948b275.tar.gz linux-stable-d0de1cab5a5a9a7103d73888e88056b3e948b275.tar.bz2 linux-stable-d0de1cab5a5a9a7103d73888e88056b3e948b275.zip |
samples: bpf: Fix build error
[ Upstream commit 23ad04669f81f958e9a4121b0266228d2eb3c357 ]
GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains
a symbol which clashes with libbpf:
/usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here
collect2: error: ld returned 1 exit status
bpf_log_buf here seems to be a leftover, so removing it.
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20200511113234.80722-1-mcroce@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | samples/bpf/lwt_len_hist_user.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/samples/bpf/lwt_len_hist_user.c b/samples/bpf/lwt_len_hist_user.c index 587b68b1f8dd..430a4b7e353e 100644 --- a/samples/bpf/lwt_len_hist_user.c +++ b/samples/bpf/lwt_len_hist_user.c @@ -15,8 +15,6 @@ #define MAX_INDEX 64 #define MAX_STARS 38 -char bpf_log_buf[BPF_LOG_BUF_SIZE]; - static void stars(char *str, long val, long max, int width) { int i; |