scftorture: Always log error message

[linux-2.6-block.git] / kernel / scftorture.c

diff --git a/kernel/scftorture.c b/kernel/scftorture.c
index 5d42f44e3e1a11a8c5c373c8f0563d891b79b80d..dcb0410950e45cd6eb0d436c185f1dd281631614 100644 (file)
--- a/kernel/scftorture.c
+++ b/kernel/scftorture.c
@@ -38,14 +38,10 @@
 #define SCFTORT_STRING "scftorture"
 #define SCFTORT_FLAG SCFTORT_STRING ": "
 
-#define SCFTORTOUT(s, x...) \
-       pr_alert(SCFTORT_FLAG s, ## x)
-
 #define VERBOSE_SCFTORTOUT(s, x...) \
-       do { if (verbose) pr_alert(SCFTORT_FLAG s, ## x); } while (0)
+       do { if (verbose) pr_alert(SCFTORT_FLAG s "\n", ## x); } while (0)
 
-#define VERBOSE_SCFTORTOUT_ERRSTRING(s, x...) \
-       do { if (verbose) pr_alert(SCFTORT_FLAG "!!! " s, ## x); } while (0)
+#define SCFTORTOUT_ERRSTRING(s, x...) pr_alert(SCFTORT_FLAG "!!! " s "\n", ## x)
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Paul E. McKenney <paulmck@kernel.org>");
@@ -587,14 +583,14 @@ static int __init scf_torture_init(void)
        if (weight_resched1 == 0 && weight_single1 == 0 && weight_single_rpc1 == 0 &&
            weight_single_wait1 == 0 && weight_many1 == 0 && weight_many_wait1 == 0 &&
            weight_all1 == 0 && weight_all_wait1 == 0) {
-               VERBOSE_SCFTORTOUT_ERRSTRING("all zero weights makes no sense");
+               SCFTORTOUT_ERRSTRING("all zero weights makes no sense");
                firsterr = -EINVAL;
                goto unwind;
        }
        if (IS_BUILTIN(CONFIG_SCF_TORTURE_TEST))
                scf_sel_add(weight_resched1, SCF_PRIM_RESCHED, false);
        else if (weight_resched1)
-               VERBOSE_SCFTORTOUT_ERRSTRING("built as module, weight_resched ignored");
+               SCFTORTOUT_ERRSTRING("built as module, weight_resched ignored");
        scf_sel_add(weight_single1, SCF_PRIM_SINGLE, false);
        scf_sel_add(weight_single_rpc1, SCF_PRIM_SINGLE_RPC, true);
        scf_sel_add(weight_single_wait1, SCF_PRIM_SINGLE, true);
@@ -625,12 +621,12 @@ static int __init scf_torture_init(void)
                nthreads = num_online_cpus();
        scf_stats_p = kcalloc(nthreads, sizeof(scf_stats_p[0]), GFP_KERNEL);
        if (!scf_stats_p) {
-               VERBOSE_SCFTORTOUT_ERRSTRING("out of memory");
+               SCFTORTOUT_ERRSTRING("out of memory");
                firsterr = -ENOMEM;
                goto unwind;
        }
 
-       VERBOSE_SCFTORTOUT("Starting %d smp_call_function() threads\n", nthreads);
+       VERBOSE_SCFTORTOUT("Starting %d smp_call_function() threads", nthreads);
 
        atomic_set(&n_started, nthreads);
        for (i = 0; i < nthreads; i++) {