summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/xmon/xmon.c
diff options
context:
space:
mode:
authorJordan Niethe <jniethe5@gmail.com>2020-12-01 11:52:03 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2020-12-04 01:01:20 +1100
commit1baa1f70ef77c4447628992ad50ab83213e2eb6c (patch)
treedc73617903cec66860d6f44d6e528b24325c5843 /arch/powerpc/xmon/xmon.c
parentf3e90408019b353fd1fcd338091fb8d3c4a1c1a5 (diff)
downloadlinux-stable-1baa1f70ef77c4447628992ad50ab83213e2eb6c.tar.gz
linux-stable-1baa1f70ef77c4447628992ad50ab83213e2eb6c.tar.bz2
linux-stable-1baa1f70ef77c4447628992ad50ab83213e2eb6c.zip
powerpc: Allow relative pointers in bug table entries
This enables GENERIC_BUG_RELATIVE_POINTERS on Power so that 32-bit offsets are stored in the bug entries rather than 64-bit pointers. While this doesn't save space for 32-bit machines, use it anyway so there is only one code path. Signed-off-by: Jordan Niethe <jniethe5@gmail.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20201201005203.15210-1-jniethe5@gmail.com
Diffstat (limited to 'arch/powerpc/xmon/xmon.c')
-rw-r--r--arch/powerpc/xmon/xmon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 5559edf36756..dcd817ca2edf 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1747,9 +1747,9 @@ static void print_bug_trap(struct pt_regs *regs)
#ifdef CONFIG_DEBUG_BUGVERBOSE
printf("kernel BUG at %s:%u!\n",
- bug->file, bug->line);
+ (char *)bug + bug->file_disp, bug->line);
#else
- printf("kernel BUG at %px!\n", (void *)bug->bug_addr);
+ printf("kernel BUG at %px!\n", (void *)bug + bug->bug_addr_disp);
#endif
#endif /* CONFIG_BUG */
}