rcutorture: Correct no-expedite console messages

The "Disabled dynamic grace-period expediting" console message is
currently printed unconditionally.  This commit causes it to be
output only when it is impossible to switch between normal and
expedited grace periods, which was the original intent.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index d2988d047d668d1d280c894beef56befdab65e65..65ae0e5c35da1a570085f390351237333167805b 100644 (file)
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -932,12 +932,14 @@ rcu_torture_writer(void *arg)
        int nsynctypes = 0;
 
        VERBOSE_TOROUT_STRING("rcu_torture_writer task started");
-       pr_alert("%s" TORTURE_FLAG
-                " Grace periods expedited from boot/sysfs for %s,\n",
-                torture_type, cur_ops->name);
-       pr_alert("%s" TORTURE_FLAG
-                " Testing of dynamic grace-period expediting diabled.\n",
-                torture_type);
+       if (!can_expedite) {
+               pr_alert("%s" TORTURE_FLAG
+                        " Grace periods expedited from boot/sysfs for %s,\n",
+                        torture_type, cur_ops->name);
+               pr_alert("%s" TORTURE_FLAG
+                        " Disabled dynamic grace-period expediting.\n",
+                        torture_type);
+       }
 
        /* Initialize synctype[] array.  If none set, take default. */
        if (!gp_cond1 && !gp_exp1 && !gp_normal1 && !gp_sync1)