From: Brendan Jackman jackmanb@google.com
mainline inclusion from mainline-5.11-rc1 commit 22e8ebe35a2e30ee19e02c41cacc99c2f896bc4b category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I5EUVD CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
-------------------------------------------------
Add missing newlines and fix polarity of strerror argument.
Signed-off-by: Brendan Jackman jackmanb@google.com Signed-off-by: Alexei Starovoitov ast@kernel.org Acked-by: Jiri Olsa jolsa@redhat.com Link: https://lore.kernel.org/bpf/20201203102234.648540-1-jackmanb@google.com (cherry picked from commit 22e8ebe35a2e30ee19e02c41cacc99c2f896bc4b) Signed-off-by: Wang Yufen wangyufen@huawei.com --- tools/bpf/resolve_btfids/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c index f32c059fbfb4..87bded641afb 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -459,7 +459,7 @@ static int symbols_collect(struct object *obj) return -ENOMEM;
if (id->addr_cnt >= ADDR_CNT) { - pr_err("FAILED symbol %s crossed the number of allowed lists", + pr_err("FAILED symbol %s crossed the number of allowed lists\n", id->name); return -1; } @@ -482,8 +482,8 @@ static int symbols_resolve(struct object *obj) btf = btf__parse(obj->btf ?: obj->path, NULL); err = libbpf_get_error(btf); if (err) { - pr_err("FAILED: load BTF from %s: %s", - obj->path, strerror(err)); + pr_err("FAILED: load BTF from %s: %s\n", + obj->path, strerror(-err)); return -1; }