[tip:timers/core] hrtimer: Improve kernel message printing

From: tip-bot for Geert Uytterhoeven
Date: Thu Jul 12 2018 - 15:34:09 EST


Commit-ID: 7a6e55375d5c584c7c11cfdcaa8ad9d6cccb419d
Gitweb: https://git.kernel.org/tip/7a6e55375d5c584c7c11cfdcaa8ad9d6cccb419d
Author: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
AuthorDate: Thu, 12 Jul 2018 16:41:18 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Thu, 12 Jul 2018 21:29:30 +0200

hrtimer: Improve kernel message printing

- Join split message for easier grepping,
- Use pr_*() instead of printk*(),
- Use %u to format unsigned cpu numbers.

Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lkml.kernel.org/r/20180712144118.8819-1-geert+renesas@xxxxxxxxx

---
kernel/time/hrtimer.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 055a4a728c00..5c2af16c7c14 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -718,8 +718,8 @@ static void hrtimer_switch_to_hres(void)
struct hrtimer_cpu_base *base = this_cpu_ptr(&hrtimer_bases);

if (tick_init_highres()) {
- printk(KERN_WARNING "Could not switch to high resolution "
- "mode on CPU %d\n", base->cpu);
+ pr_warn("Could not switch to high resolution mode on CPU %u\n",
+ base->cpu);
return;
}
base->hres_active = 1;
@@ -1573,8 +1573,7 @@ retry:
else
expires_next = ktime_add(now, delta);
tick_program_event(expires_next, 1);
- printk_once(KERN_WARNING "hrtimer: interrupt took %llu ns\n",
- ktime_to_ns(delta));
+ pr_warn_once("hrtimer: interrupt took %llu ns\n", ktime_to_ns(delta));
}

/* called with interrupts disabled */