diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-12-08 23:57:47 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-12-08 23:57:47 +1100 |
| commit | f24f21c4122e837fa031cc512a7f20eb8c554c5e (patch) | |
| tree | b19acb396850fbfb36218329659b926446c24914 /tools/objtool/special.c | |
| parent | 64fdcbcc064966bbf261bb455876dffa58858d32 (diff) | |
| parent | a39818a3fb2bf12ae945a7c5fba8c5d9048a0e96 (diff) | |
| download | linux-f24f21c4122e837fa031cc512a7f20eb8c554c5e.tar.gz linux-f24f21c4122e837fa031cc512a7f20eb8c554c5e.tar.bz2 linux-f24f21c4122e837fa031cc512a7f20eb8c554c5e.zip | |
Merge branch 'topic/objtool' into next
Merge the powerpc objtool support, which we were keeping in a topic
branch in case of any merge conflicts.
Diffstat (limited to 'tools/objtool/special.c')
| -rw-r--r-- | tools/objtool/special.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/objtool/special.c b/tools/objtool/special.c index e2223dd91c37..9c8d827f69af 100644 --- a/tools/objtool/special.c +++ b/tools/objtool/special.c @@ -87,7 +87,8 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry, if (entry->feature) { unsigned short feature; - feature = bswap_if_needed(*(unsigned short *)(sec->data->d_buf + + feature = bswap_if_needed(elf, + *(unsigned short *)(sec->data->d_buf + offset + entry->feature)); arch_handle_alternative(feature, alt); |