The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 2bc3dec7055e34c2c2e497f109da6748544c0791
Gitweb: https://git.kernel.org/tip/2bc3dec7055e34c2c2e497f109da6748544c0791
Author: Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Mon, 18 Apr 2022 09:50:28 -07:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 22 Apr 2022 12:32:02 +02:00
objtool: Don't print parentheses in function addresses
The parentheses in the "func()+off" address output are inconsistent with
how the kernel prints function addresses, breaking Peter's scripts.
Remove them.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/f2bec70312f62ef4f1ea21c134d9def627182ad3.1650300597.git.jpoimboe@redhat.com
---
tools/objtool/include/objtool/warn.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tools/objtool/include/objtool/warn.h b/tools/objtool/include/objtool/warn.h
index 802cfda..c4bde3e 100644
--- a/tools/objtool/include/objtool/warn.h
+++ b/tools/objtool/include/objtool/warn.h
@@ -33,11 +33,7 @@ static inline char *offstr(struct section *sec, unsigned long offset)
}
str = malloc(strlen(name) + 20);
-
- if (func)
- sprintf(str, "%s()+0x%lx", name, name_off);
- else
- sprintf(str, "%s+0x%lx", name, name_off);
+ sprintf(str, "%s+0x%lx", name, name_off);
return str;
}