On Tue, 16 Sep 2014 17:20:46 +0200
Markus Trippelsdorf <mar...@trippelsdorf.de> wrote:
> On 2014.09.16 at 11:13 -0400, Steven Rostedt wrote
> I'll leave it to you. This is just a cosmetic issue, so there's no need
> to fix this immediately.
>
Actually the fix is much simpler (I had to wait for the drugs to wear
off before I noticed this ;-):
>From 2a88421634bf7a5238b18d829c64f8fd59f12aab Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <rost...@goodmis.org>
Date: Tue, 16 Sep 2014 15:08:24 -0400
Subject: [PATCH] timer: Remove redundant log level from printk_deferred() call
printk_deferred() is only used in critical sections that is unsafe to
call printk() directly, and these prints are for warnings only. They
do not take a printk loglevel (KERN_*) in their formats. A KERN_WARNING
is assumed and applied by the call itself.
Cc: Jan Kara <j...@suse.cz>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: sta...@vger.kernel.org # 3.16+
Fixes: 504d58745c9c "timer: Fix lock inversion between hrtimer_bases.lock and
scheduler locks"
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
---
kernel/time/clockevents.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 9c94c19f1305..0a7516e59610 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -146,8 +146,7 @@ static int clockevents_increase_min_delta(struct
clock_event_device *dev)
{
/* Nothing to do if we already reached the limit */
if (dev->min_delta_ns >= MIN_DELTA_LIMIT) {
- printk_deferred(KERN_WARNING
- "CE: Reprogramming failure. Giving up\n");
+ printk_deferred("CE: Reprogramming failure. Giving up\n");
dev->next_event.tv64 = KTIME_MAX;
return -ETIME;
}
@@ -160,8 +159,7 @@ static int clockevents_increase_min_delta(struct
clock_event_device *dev)
if (dev->min_delta_ns > MIN_DELTA_LIMIT)
dev->min_delta_ns = MIN_DELTA_LIMIT;
- printk_deferred(KERN_WARNING
- "CE: %s increased min_delta_ns to %llu nsec\n",
+ printk_deferred("CE: %s increased min_delta_ns to %llu nsec\n",
dev->name ? dev->name : "?",
(unsigned long long) dev->min_delta_ns);
return 0;
--
1.8.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
