rcutorture: Abstract function and module names

This commit moves to __func__ for function names and for KBUILD_MODNAME
for module names, all in the name of better resilience to change.

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

diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index b4a201dcbc55c9a4a7b80c3851d2a32a76ec4aea..0f94025c672a8b2f07c6ba0af136630e43ef8a64 100644 (file)
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -924,19 +924,19 @@ rcu_torture_writer(void *arg)
        if (gp_cond1 && cur_ops->get_state && cur_ops->cond_sync)
                synctype[nsynctypes++] = RTWS_COND_GET;
        else if (gp_cond && (!cur_ops->get_state || !cur_ops->cond_sync))
-               pr_alert("rcu_torture_writer: gp_cond without primitives.\n");
+               pr_alert("%s: gp_cond without primitives.\n", __func__);
        if (gp_exp1 && cur_ops->exp_sync)
                synctype[nsynctypes++] = RTWS_EXP_SYNC;
        else if (gp_exp && !cur_ops->exp_sync)
-               pr_alert("rcu_torture_writer: gp_exp without primitives.\n");
+               pr_alert("%s: gp_exp without primitives.\n", __func__);
        if (gp_normal1 && cur_ops->deferred_free)
                synctype[nsynctypes++] = RTWS_DEF_FREE;
        else if (gp_normal && !cur_ops->deferred_free)
-               pr_alert("rcu_torture_writer: gp_normal without primitives.\n");
+               pr_alert("%s: gp_normal without primitives.\n", __func__);
        if (gp_sync1 && cur_ops->sync)
                synctype[nsynctypes++] = RTWS_SYNC;
        else if (gp_sync && !cur_ops->sync)
-               pr_alert("rcu_torture_writer: gp_sync without primitives.\n");
+               pr_alert("%s: gp_sync without primitives.\n", __func__);
        if (WARN_ONCE(nsynctypes == 0,
                      "rcu_torture_writer: No update-side primitives.\n")) {
                /*
@@ -1673,7 +1673,7 @@ static void rcu_torture_err_cb(struct rcu_head *rhp)
         * next grace period.  Unlikely, but can happen.  If it
         * does happen, the debug-objects subsystem won't have splatted.
         */
-       pr_alert("rcutorture: duplicated callback was invoked.\n");
+       pr_alert("%s: duplicated callback was invoked.\n", KBUILD_MODNAME);
 }
 #endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */
 
@@ -1690,7 +1690,7 @@ static void rcu_test_debug_objects(void)
 
        init_rcu_head_on_stack(&rh1);
        init_rcu_head_on_stack(&rh2);
-       pr_alert("rcutorture: WARN: Duplicate call_rcu() test starting.\n");
+       pr_alert("%s: WARN: Duplicate call_rcu() test starting.\n", KBUILD_MODNAME);
 
        /* Try to queue the rh2 pair of callbacks for the same grace period. */
        preempt_disable(); /* Prevent preemption from interrupting test. */
@@ -1705,11 +1705,11 @@ static void rcu_test_debug_objects(void)
 
        /* Wait for them all to get done so we can safely return. */
        rcu_barrier();
-       pr_alert("rcutorture: WARN: Duplicate call_rcu() test complete.\n");
+       pr_alert("%s: WARN: Duplicate call_rcu() test complete.\n", KBUILD_MODNAME);
        destroy_rcu_head_on_stack(&rh1);
        destroy_rcu_head_on_stack(&rh2);
 #else /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */
-       pr_alert("rcutorture: !CONFIG_DEBUG_OBJECTS_RCU_HEAD, not testing duplicate call_rcu()\n");
+       pr_alert("%s: !CONFIG_DEBUG_OBJECTS_RCU_HEAD, not testing duplicate call_rcu()\n", KBUILD_MODNAME);
 #endif /* #else #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */
 }