]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tick/sched: Combine WARN_ON_ONCE and print_once
authorAnna-Maria Behnsen <anna-maria@linutronix.de>
Mon, 10 Jun 2024 10:35:52 +0000 (12:35 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 3 Jul 2024 19:32:55 +0000 (21:32 +0200)
When the WARN_ON_ONCE() triggers, the printk() of the additional
information related to the warning will not happen in print level
"warn". When reading dmesg with a restriction to level "warn", the
information published by the printk_once() will not show up there.

Transform WARN_ON_ONCE() and printk_once() into a WARN_ONCE().

Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20240610103552.25252-1-anna-maria@linutronix.de
kernel/time/tick-sched.c

index 43a6370a2ebca7bc48f61278a59bdddd15a83bb1..753a184c70907a0f11f5041b82ef8d6a317e5921 100644 (file)
@@ -1026,10 +1026,10 @@ static void tick_nohz_stop_tick(struct tick_sched *ts, int cpu)
                if (expires == KTIME_MAX || ts->next_tick == hrtimer_get_expires(&ts->sched_timer))
                        return;
 
-               WARN_ON_ONCE(1);
-               printk_once("basemono: %llu ts->next_tick: %llu dev->next_event: %llu timer->active: %d timer->expires: %llu\n",
-                           basemono, ts->next_tick, dev->next_event,
-                           hrtimer_active(&ts->sched_timer), hrtimer_get_expires(&ts->sched_timer));
+               WARN_ONCE(1, "basemono: %llu ts->next_tick: %llu dev->next_event: %llu "
+                         "timer->active: %d timer->expires: %llu\n", basemono, ts->next_tick,
+                         dev->next_event, hrtimer_active(&ts->sched_timer),
+                         hrtimer_get_expires(&ts->sched_timer));
        }
 
        /*