powerpc/xmon: Specify the full format in DUMP() macro

In dump_one_paca() the DUMP macro unconditionally prepends '#' to the
printf format specifier. In most cases we're using either 'x' or 'lx'
etc. and that is OK. But for 'p' and other formats using '#' is
actually undefined, and once we enable printf() checking for
xmon_printf() we will get warnings from the compiler.

So just have each usage specify the full format, that way we can omit
'#' when it's inappropriate.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Mathieu Malaterre <malat@debian.org>

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 252df97..a3d597c 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -2350,27 +2350,27 @@ static void dump_one_paca(int cpu)
        printf(" %-*s = %s\n", 20, "present", cpu_present(cpu) ? "yes" : "no");
        printf(" %-*s = %s\n", 20, "online", cpu_online(cpu) ? "yes" : "no");
 
-#define DUMP(paca, name, format) \
-       printf(" %-*s = %#-*"format"\t(0x%lx)\n", 20, #name, 18, paca->name, \
+#define DUMP(paca, name, format)                               \
+       printf(" %-*s = "format"\t(0x%lx)\n", 20, #name, 18, paca->name, \
                offsetof(struct paca_struct, name));
 
-       DUMP(p, lock_token, "x");
-       DUMP(p, paca_index, "x");
-       DUMP(p, kernel_toc, "lx");
-       DUMP(p, kernelbase, "lx");
-       DUMP(p, kernel_msr, "lx");
-       DUMP(p, emergency_sp, "px");
+       DUMP(p, lock_token, "%#-*x");
+       DUMP(p, paca_index, "%#-*x");
+       DUMP(p, kernel_toc, "%#-*lx");
+       DUMP(p, kernelbase, "%#-*lx");
+       DUMP(p, kernel_msr, "%#-*lx");
+       DUMP(p, emergency_sp, "%-*px");
 #ifdef CONFIG_PPC_BOOK3S_64
-       DUMP(p, nmi_emergency_sp, "px");
-       DUMP(p, mc_emergency_sp, "px");
-       DUMP(p, in_nmi, "x");
-       DUMP(p, in_mce, "x");
-       DUMP(p, hmi_event_available, "x");
+       DUMP(p, nmi_emergency_sp, "%-*px");
+       DUMP(p, mc_emergency_sp, "%-*px");
+       DUMP(p, in_nmi, "%#-*x");
+       DUMP(p, in_mce, "%#-*x");
+       DUMP(p, hmi_event_available, "%#-*x");
 #endif
-       DUMP(p, data_offset, "lx");
-       DUMP(p, hw_cpu_id, "x");
-       DUMP(p, cpu_start, "x");
-       DUMP(p, kexec_state, "x");
+       DUMP(p, data_offset, "%#-*lx");
+       DUMP(p, hw_cpu_id, "%#-*x");
+       DUMP(p, cpu_start, "%#-*x");
+       DUMP(p, kexec_state, "%#-*x");
 #ifdef CONFIG_PPC_BOOK3S_64
        for (i = 0; i < SLB_NUM_BOLTED; i++) {
                u64 esid, vsid;
@@ -2386,54 +2386,54 @@ static void dump_one_paca(int cpu)
                                i, esid, vsid);
                }
        }
-       DUMP(p, vmalloc_sllp, "x");
-       DUMP(p, slb_cache_ptr, "x");
+       DUMP(p, vmalloc_sllp, "%#-*x");
+       DUMP(p, slb_cache_ptr, "%#-*x");
        for (i = 0; i < SLB_CACHE_ENTRIES; i++)
                printf(" slb_cache[%d]:        = 0x%016lx\n", i, p->slb_cache[i]);
 
-       DUMP(p, rfi_flush_fallback_area, "px");
+       DUMP(p, rfi_flush_fallback_area, "%-*px");
 #endif
-       DUMP(p, dscr_default, "llx");
+       DUMP(p, dscr_default, "%#-*llx");
 #ifdef CONFIG_PPC_BOOK3E
-       DUMP(p, pgd, "px");
-       DUMP(p, kernel_pgd, "px");
-       DUMP(p, tcd_ptr, "px");
-       DUMP(p, mc_kstack, "px");
-       DUMP(p, crit_kstack, "px");
-       DUMP(p, dbg_kstack, "px");
+       DUMP(p, pgd, "%-*px");
+       DUMP(p, kernel_pgd, "%-*px");
+       DUMP(p, tcd_ptr, "%-*px");
+       DUMP(p, mc_kstack, "%-*px");
+       DUMP(p, crit_kstack, "%-*px");
+       DUMP(p, dbg_kstack, "%-*px");
 #endif
-       DUMP(p, __current, "px");
-       DUMP(p, kstack, "lx");
+       DUMP(p, __current, "%-*px");
+       DUMP(p, kstack, "%#-*lx");
        printf(" kstack_base          = 0x%016lx\n", p->kstack & ~(THREAD_SIZE - 1));
-       DUMP(p, stab_rr, "lx");
-       DUMP(p, saved_r1, "lx");
-       DUMP(p, trap_save, "x");
-       DUMP(p, irq_soft_mask, "x");
-       DUMP(p, irq_happened, "x");
-       DUMP(p, io_sync, "x");
-       DUMP(p, irq_work_pending, "x");
-       DUMP(p, nap_state_lost, "x");
-       DUMP(p, sprg_vdso, "llx");
+       DUMP(p, stab_rr, "%#-*lx");
+       DUMP(p, saved_r1, "%#-*lx");
+       DUMP(p, trap_save, "%#-*x");
+       DUMP(p, irq_soft_mask, "%#-*x");
+       DUMP(p, irq_happened, "%#-*x");
+       DUMP(p, io_sync, "%#-*x");
+       DUMP(p, irq_work_pending, "%#-*x");
+       DUMP(p, nap_state_lost, "%#-*x");
+       DUMP(p, sprg_vdso, "%#-*llx");
 
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
-       DUMP(p, tm_scratch, "llx");
+       DUMP(p, tm_scratch, "%#-*llx");
 #endif
 
 #ifdef CONFIG_PPC_POWERNV
-       DUMP(p, core_idle_state_ptr, "px");
-       DUMP(p, thread_idle_state, "x");
-       DUMP(p, thread_mask, "x");
-       DUMP(p, subcore_sibling_mask, "x");
+       DUMP(p, core_idle_state_ptr, "%-*px");
+       DUMP(p, thread_idle_state, "%#-*x");
+       DUMP(p, thread_mask, "%#-*x");
+       DUMP(p, subcore_sibling_mask, "%#-*x");
 #endif
 
-       DUMP(p, accounting.utime, "llx");
-       DUMP(p, accounting.stime, "llx");
-       DUMP(p, accounting.utime_scaled, "llx");
-       DUMP(p, accounting.starttime, "llx");
-       DUMP(p, accounting.starttime_user, "llx");
-       DUMP(p, accounting.startspurr, "llx");
-       DUMP(p, accounting.utime_sspurr, "llx");
-       DUMP(p, accounting.steal_time, "llx");
+       DUMP(p, accounting.utime, "%#-*llx");
+       DUMP(p, accounting.stime, "%#-*llx");
+       DUMP(p, accounting.utime_scaled, "%#-*llx");
+       DUMP(p, accounting.starttime, "%#-*llx");
+       DUMP(p, accounting.starttime_user, "%#-*llx");
+       DUMP(p, accounting.startspurr, "%#-*llx");
+       DUMP(p, accounting.utime_sspurr, "%#-*llx");
+       DUMP(p, accounting.steal_time, "%#-*llx");
 #undef DUMP
 
        catch_memory_errors = 0;