5 files changed, 20 insertions, 14 deletions

diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
index b080bc4a4f45..00e395c0d7d0 100644
--- a/kernel/rcu/rcuperf.c
+++ b/kernel/rcu/rcuperf.c
@@ -680,12 +680,11 @@ rcu_perf_init(void)
                         break;
         }
         if (i == ARRAY_SIZE(perf_ops)) {
-                pr_alert("rcu-perf: invalid perf type: \"%s\"\n",
-                         perf_type);
+                pr_alert("rcu-perf: invalid perf type: \"%s\"\n", perf_type);
                 pr_alert("rcu-perf types:");
                 for (i = 0; i < ARRAY_SIZE(perf_ops); i++)
-                        pr_alert(" %s", perf_ops[i]->name);
-                pr_alert("\n");
+                        pr_cont(" %s", perf_ops[i]->name);
+                pr_cont("\n");
                 firsterr = -EINVAL;
                 goto unwind;
         }
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 0481c7286875..90a94fecdd73 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -1755,8 +1755,8 @@ rcu_torture_init(void)
                          torture_type);
                 pr_alert("rcu-torture types:");
                 for (i = 0; i < ARRAY_SIZE(torture_ops); i++)
-                        pr_alert(" %s", torture_ops[i]->name);
-                pr_alert("\n");
+                        pr_cont(" %s", torture_ops[i]->name);
+                pr_cont("\n");
                 firsterr = -EINVAL;
                 goto unwind;
         }
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index d6d6ea9738c0..e526b56998af 100644
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -26,6 +26,8 @@
  *
  */
 
+#define pr_fmt(fmt) "rcu: " fmt
+
 #include <linux/export.h>
 #include <linux/mutex.h>
 #include <linux/percpu.h>
@@ -390,7 +392,8 @@ void _cleanup_srcu_struct(struct srcu_struct *sp, bool quiesced)
                 }
         if (WARN_ON(rcu_seq_state(READ_ONCE(sp->srcu_gp_seq)) != SRCU_STATE_IDLE) ||
             WARN_ON(srcu_readers_active(sp))) {
-                pr_info("%s: Active srcu_struct %p state: %d\n", __func__, sp, rcu_seq_state(READ_ONCE(sp->srcu_gp_seq)));
+                pr_info("%s: Active srcu_struct %p state: %d\n",
+                        __func__, sp, rcu_seq_state(READ_ONCE(sp->srcu_gp_seq)));
                 return; /* Caller forgot to stop doing call_srcu()? */
         }
         free_percpu(sp->sda);
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 19beabe73629..6f2922168216 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -27,6 +27,9 @@
  * For detailed explanation of Read-Copy Update mechanism see -
  *      Documentation/RCU
  */
+
+#define pr_fmt(fmt) "rcu: " fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -1374,8 +1377,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gp_seq)
          * See Documentation/RCU/stallwarn.txt for info on how to debug
          * RCU CPU stall warnings.
          */
-        pr_err("INFO: %s detected stalls on CPUs/tasks:",
-               rsp->name);
+        pr_err("INFO: %s detected stalls on CPUs/tasks:", rsp->name);
         print_cpu_stall_info_begin();
         rcu_for_each_leaf_node(rsp, rnp) {
                 raw_spin_lock_irqsave_rcu_node(rnp, flags);
@@ -4048,7 +4050,7 @@ static void __init rcu_init_geometry(void)
         if (rcu_fanout_leaf == RCU_FANOUT_LEAF &&
             nr_cpu_ids == NR_CPUS)
                 return;
-        pr_info("RCU: Adjusting geometry for rcu_fanout_leaf=%d, nr_cpu_ids=%u\n",
+        pr_info("Adjusting geometry for rcu_fanout_leaf=%d, nr_cpu_ids=%u\n",
                 rcu_fanout_leaf, nr_cpu_ids);
 
         /*
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index 54a251640f53..dbfe90191e19 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -74,8 +74,8 @@ static void __init rcu_bootup_announce_oddness(void)
                 pr_info("\tRCU event tracing is enabled.\n");
         if ((IS_ENABLED(CONFIG_64BIT) && RCU_FANOUT != 64) ||
             (!IS_ENABLED(CONFIG_64BIT) && RCU_FANOUT != 32))
-                pr_info("\tCONFIG_RCU_FANOUT set to non-default value of %d\n",
-                       RCU_FANOUT);
+                pr_info("\tCONFIG_RCU_FANOUT set to non-default value of %d.\n",
+                        RCU_FANOUT);
         if (rcu_fanout_exact)
                 pr_info("\tHierarchical RCU autobalancing is disabled.\n");
         if (IS_ENABLED(CONFIG_RCU_FAST_NO_HZ))
@@ -88,11 +88,13 @@ static void __init rcu_bootup_announce_oddness(void)
                 pr_info("\tBuild-time adjustment of leaf fanout to %d.\n",
                         RCU_FANOUT_LEAF);
         if (rcu_fanout_leaf != RCU_FANOUT_LEAF)
-                pr_info("\tBoot-time adjustment of leaf fanout to %d.\n", rcu_fanout_leaf);
+                pr_info("\tBoot-time adjustment of leaf fanout to %d.\n",
+                        rcu_fanout_leaf);
         if (nr_cpu_ids != NR_CPUS)
                 pr_info("\tRCU restricting CPUs from NR_CPUS=%d to nr_cpu_ids=%u.\n", NR_CPUS, nr_cpu_ids);
 #ifdef CONFIG_RCU_BOOST
-        pr_info("\tRCU priority boosting: priority %d delay %d ms.\n", kthread_prio, CONFIG_RCU_BOOST_DELAY);
+        pr_info("\tRCU priority boosting: priority %d delay %d ms.\n",
+                kthread_prio, CONFIG_RCU_BOOST_DELAY);
 #endif
         if (blimit != DEFAULT_RCU_BLIMIT)
                 pr_info("\tBoot-time adjustment of callback invocation limit to %ld.\n", blimit);