aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2018-01-10 09:17:24 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2018-01-10 09:17:24 -0500
commit2248fade965a5f1ba2a8e6e63f84df696b2d2780 (patch)
treeaa315b9c961380e01e9efcaaefa493ac7f754763
parent274920a3ecd5f43af0cc380bc0a9ee73a52b9f8a (diff)
powerpc/xmon: Don't print hashed pointers in paca dump
Remember when the biggest problem we had to worry about was hashed pointers, those were the days. These were missed in my earlier patch because they don't match "%p", but the macro is hiding a "%p", so these all end up being hashed, which is not what we want in xmon. Convert them to "%px". Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/xmon/xmon.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index b3bb5beec54a..0ddc7ac6c5f1 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -2344,10 +2344,10 @@ static void dump_one_paca(int cpu)
2344 DUMP(p, kernel_toc, "lx"); 2344 DUMP(p, kernel_toc, "lx");
2345 DUMP(p, kernelbase, "lx"); 2345 DUMP(p, kernelbase, "lx");
2346 DUMP(p, kernel_msr, "lx"); 2346 DUMP(p, kernel_msr, "lx");
2347 DUMP(p, emergency_sp, "p"); 2347 DUMP(p, emergency_sp, "px");
2348#ifdef CONFIG_PPC_BOOK3S_64 2348#ifdef CONFIG_PPC_BOOK3S_64
2349 DUMP(p, nmi_emergency_sp, "p"); 2349 DUMP(p, nmi_emergency_sp, "px");
2350 DUMP(p, mc_emergency_sp, "p"); 2350 DUMP(p, mc_emergency_sp, "px");
2351 DUMP(p, in_nmi, "x"); 2351 DUMP(p, in_nmi, "x");
2352 DUMP(p, in_mce, "x"); 2352 DUMP(p, in_mce, "x");
2353 DUMP(p, hmi_event_available, "x"); 2353 DUMP(p, hmi_event_available, "x");
@@ -2382,14 +2382,14 @@ static void dump_one_paca(int cpu)
2382#endif 2382#endif
2383 DUMP(p, dscr_default, "llx"); 2383 DUMP(p, dscr_default, "llx");
2384#ifdef CONFIG_PPC_BOOK3E 2384#ifdef CONFIG_PPC_BOOK3E
2385 DUMP(p, pgd, "p"); 2385 DUMP(p, pgd, "px");
2386 DUMP(p, kernel_pgd, "p"); 2386 DUMP(p, kernel_pgd, "px");
2387 DUMP(p, tcd_ptr, "p"); 2387 DUMP(p, tcd_ptr, "px");
2388 DUMP(p, mc_kstack, "p"); 2388 DUMP(p, mc_kstack, "px");
2389 DUMP(p, crit_kstack, "p"); 2389 DUMP(p, crit_kstack, "px");
2390 DUMP(p, dbg_kstack, "p"); 2390 DUMP(p, dbg_kstack, "px");
2391#endif 2391#endif
2392 DUMP(p, __current, "p"); 2392 DUMP(p, __current, "px");
2393 DUMP(p, kstack, "lx"); 2393 DUMP(p, kstack, "lx");
2394 printf(" kstack_base = 0x%016lx\n", p->kstack & ~(THREAD_SIZE - 1)); 2394 printf(" kstack_base = 0x%016lx\n", p->kstack & ~(THREAD_SIZE - 1));
2395 DUMP(p, stab_rr, "lx"); 2395 DUMP(p, stab_rr, "lx");
@@ -2407,7 +2407,7 @@ static void dump_one_paca(int cpu)
2407#endif 2407#endif
2408 2408
2409#ifdef CONFIG_PPC_POWERNV 2409#ifdef CONFIG_PPC_POWERNV
2410 DUMP(p, core_idle_state_ptr, "p"); 2410 DUMP(p, core_idle_state_ptr, "px");
2411 DUMP(p, thread_idle_state, "x"); 2411 DUMP(p, thread_idle_state, "x");
2412 DUMP(p, thread_mask, "x"); 2412 DUMP(p, thread_mask, "x");
2413 DUMP(p, subcore_sibling_mask, "x"); 2413 DUMP(p, subcore_sibling_mask, "x");