From: Andrii Anisov <andrii_anisov@epam.com>
Date: Wed, 12 Sep 2018 17:03:27 +0000 (+0300)
Subject: Change timestamps representation for keyhandlers
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3258
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=889b200cb52;p=xen.git

Change timestamps representation for keyhandlers

For different keyhandlers, replace a hex with delimiter representation
of time to PRI_stime which is decimal ns currently.

Signed-off-by: Andrii Anisov <andrii_anisov@epam.com>
Reviewed-by: Dario Faggioli <dfaggioli@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: George Dunlap <george.dunlap@citrix.com>
---

diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
index 0498cbd1e3..8e08173940 100644
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -378,8 +378,8 @@ static void dump_numa(unsigned char key)
     unsigned int page_num_node[MAX_NUMNODES];
     const struct vnuma_info *vnuma;
 
-    printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key,
-           (u32)(now>>32), (u32)now);
+    printk("'%c' pressed -> dumping numa info (now = %"PRI_stime")\n", key,
+           now);
 
     for_each_online_node ( i )
     {
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 777c8e96fc..60bbeebb4b 100644
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -286,8 +286,8 @@ static void dump_domains(unsigned char key)
     s_time_t       now = NOW();
 #define tmpstr keyhandler_scratch
 
-    printk("'%c' pressed -> dumping domain info (now=0x%X:%08X)\n", key,
-           (u32)(now>>32), (u32)now);
+    printk("'%c' pressed -> dumping domain info (now = %"PRI_stime"\n", key,
+           now);
 
     rcu_read_lock(&domlist_read_lock);
 
diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 02aeed7c47..16e1b0c357 100644
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -2420,8 +2420,8 @@ static void dump_heap(unsigned char key)
     s_time_t      now = NOW();
     int           i, j;
 
-    printk("'%c' pressed -> dumping heap info (now-0x%X:%08X)\n", key,
-           (u32)(now>>32), (u32)now);
+    printk("'%c' pressed -> dumping heap info (now = %"PRI_stime")\n", key,
+           now);
 
     for ( i = 0; i < MAX_NUMNODES; i++ )
     {
diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index 067567766a..3abe35892a 100644
--- a/xen/common/perfc.c
+++ b/xen/common/perfc.c
@@ -33,8 +33,7 @@ void perfc_printall(unsigned char key)
     unsigned int i, j;
     s_time_t now = NOW();
 
-    printk("Xen performance counters SHOW  (now = 0x%08X:%08X)\n",
-           (u32)(now>>32), (u32)now);
+    printk("Xen performance counters SHOW  (now = %"PRI_stime")\n", now);
 
     for ( i = j = 0; i < NR_PERFCTRS; i++ )
     {
@@ -122,8 +121,7 @@ void perfc_reset(unsigned char key)
     s_time_t now = NOW();
 
     if ( key != '\0' )
-        printk("Xen performance counters RESET (now = 0x%08X:%08X)\n",
-               (u32)(now>>32), (u32)now);
+        printk("Xen performance counters RESET (now = %"PRI_stime")\n", now);
 
     /* leave STATUS counters alone -- don't reset */
 
diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c
index 36e31c91ff..6bc52d70c0 100644
--- a/xen/common/spinlock.c
+++ b/xen/common/spinlock.c
@@ -359,9 +359,8 @@ void spinlock_profile_printall(unsigned char key)
     s_time_t diff;
 
     diff = now - lock_profile_start;
-    printk("Xen lock profile info SHOW  (now = %08X:%08X, "
-        "total = %08X:%08X)\n", (u32)(now>>32), (u32)now,
-        (u32)(diff>>32), (u32)diff);
+    printk("Xen lock profile info SHOW  (now = %"PRI_stime" total = "
+           "%"PRI_stime")\n", now, diff);
     spinlock_profile_iterate(spinlock_profile_print_elem, NULL);
 }
 
@@ -379,8 +378,7 @@ void spinlock_profile_reset(unsigned char key)
     s_time_t now = NOW();
 
     if ( key != '\0' )
-        printk("Xen lock profile info RESET (now = %08X:%08X)\n",
-            (u32)(now>>32), (u32)now);
+        printk("Xen lock profile info RESET (now = %"PRI_stime")\n", now);
     lock_profile_start = now;
     spinlock_profile_iterate(spinlock_profile_reset_elem, NULL);
 }