From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 12 Dec 2016 16:48:19 +0000 (+0100)
Subject: x86/time: don't omit newline in dump_softtsc()
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3184
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=48f11132b7977510b75c9d96539514a55801f654;p=xen.git

x86/time: don't omit newline in dump_softtsc()

Reported-by: Anton Samsonov <devel@zxlab.ru>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index e511a51486..cb6939eb29 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -2145,12 +2145,11 @@ static void dump_softtsc(unsigned char key)
         if ( d->arch.incarnation )
             printk(",inc=%"PRIu32, d->arch.incarnation);
 #if !defined(NDEBUG) || defined(CONFIG_PERF_COUNTERS)
-        if ( !(d->arch.vtsc_kerncount | d->arch.vtsc_usercount) )
-            printk("\n");
-        else
-            printk(",vtsc count: %"PRIu64" kernel, %"PRIu64" user\n",
+        if ( d->arch.vtsc_kerncount | d->arch.vtsc_usercount )
+            printk(",vtsc count: %"PRIu64" kernel,%"PRIu64" user",
                    d->arch.vtsc_kerncount, d->arch.vtsc_usercount);
 #endif
+        printk("\n");
         domcnt++;
     }