Merge tag 'powerpc-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[platform/kernel/linux-starfive.git] / arch / powerpc / xmon / xmon.c

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 57503cd..26fa03f 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -920,7 +920,7 @@ cmds(struct pt_regs *excp)
                                memzcan();
                                break;
                        case 'i':
-                               show_mem(0);
+                               show_mem(0, NULL);
                                break;
                        default:
                                termch = cmd;
@@ -2291,14 +2291,14 @@ static void dump_one_paca(int cpu)
        DUMP(p, subcore_sibling_mask, "x");
 #endif
 
-       DUMP(p, accounting.user_time, "llx");
-       DUMP(p, accounting.system_time, "llx");
-       DUMP(p, accounting.user_time_scaled, "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, stolen_time, "llx");
+       DUMP(p, accounting.steal_time, "llx");
 #undef DUMP
 
        catch_memory_errors = 0;