diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-01-19 12:32:05 -0500 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-01-19 12:32:05 -0500 |
| commit | 54156da8937c9f5f84b4215e239a61ecc7c29275 (patch) | |
| tree | 7fb1e07ebedc5fbd35a29f5d450dee538763efdb /tools/objtool/orc_dump.c | |
| parent | f7a71b0cf9e36c1b0edbfe89ce028a01164b864d (diff) | |
| parent | 4a6cc7a44e98a0460bd094b68c75f0705fdc450a (diff) | |
| download | linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.gz linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.bz2 linux-54156da8937c9f5f84b4215e239a61ecc7c29275.zip | |
Merge airlied/drm-next into drm-misc-next
It's been a while since we've backmerged drm-next. Dave just brought
back 4.15-rc8, so now's a good time to freshen things up around here.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'tools/objtool/orc_dump.c')
| -rw-r--r-- | tools/objtool/orc_dump.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/objtool/orc_dump.c b/tools/objtool/orc_dump.c index 36c5bf6a2675..c3343820916a 100644 --- a/tools/objtool/orc_dump.c +++ b/tools/objtool/orc_dump.c @@ -76,7 +76,8 @@ int orc_dump(const char *_objname) int fd, nr_entries, i, *orc_ip = NULL, orc_size = 0; struct orc_entry *orc = NULL; char *name; - unsigned long nr_sections, orc_ip_addr = 0; + size_t nr_sections; + Elf64_Addr orc_ip_addr = 0; size_t shstrtab_idx; Elf *elf; Elf_Scn *scn; @@ -187,10 +188,10 @@ int orc_dump(const char *_objname) return -1; } - printf("%s+%lx:", name, rela.r_addend); + printf("%s+%llx:", name, (unsigned long long)rela.r_addend); } else { - printf("%lx:", orc_ip_addr + (i * sizeof(int)) + orc_ip[i]); + printf("%llx:", (unsigned long long)(orc_ip_addr + (i * sizeof(int)) + orc_ip[i])); } |