3 files changed, 13 insertions, 13 deletions

diff --git a/include/linux/printk.h b/include/linux/printk.h
index 7847301e2837..f086d6c99dbc 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -266,9 +266,20 @@ extern asmlinkage void dump_stack(void) __cold;
                 printk(fmt, ##__VA_ARGS__);                     \
         }                                                       \
 })
+#define printk_deferred_once(fmt, ...)                          \
+({                                                              \
+        static bool __print_once __read_mostly;                 \
+                                                                \
+        if (!__print_once) {                                    \
+                __print_once = true;                            \
+                printk_deferred(fmt, ##__VA_ARGS__);            \
+        }                                                       \
+})
 #else
 #define printk_once(fmt, ...)                                   \
         no_printk(fmt, ##__VA_ARGS__)
+#define printk_deferred_once(fmt, ...)                          \
+        no_printk(fmt, ##__VA_ARGS__)
 #endif
 
 #define pr_emerg_once(fmt, ...)                                 \
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index d17e1c48a79d..e1574fca03b5 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -348,12 +348,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,
          * entity.
          */
         if (dl_time_before(dl_se->deadline, rq_clock(rq))) {
-                static bool lag_once = false;
-
-                if (!lag_once) {
-                        lag_once = true;
-                        printk_deferred("sched: DL replenish lagged to much\n");
-                }
+                printk_deferred_once("sched: DL replenish lagged to much\n");
                 dl_se->deadline = rq_clock(rq) + pi_se->dl_deadline;
                 dl_se->runtime = pi_se->dl_runtime;
         }
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 5d7667b37c21..b3512f1afce9 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -890,14 +890,8 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq)
                  * but accrue some time due to boosting.
                  */
                 if (likely(rt_b->rt_runtime)) {
-                        static bool once = false;
-
                         rt_rq->rt_throttled = 1;
-
-                        if (!once) {
-                                once = true;
-                                printk_deferred("sched: RT throttling activated\n");
-                        }
+                        printk_deferred_once("sched: RT throttling activated\n");
                 } else {
                         /*
                          * In case we did anyway, make it go away,