Merge tag 'sound-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / kernel / torture.c

diff --git a/kernel/torture.c b/kernel/torture.c
index 01e336f..bb8f411 100644 (file)
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -521,11 +521,11 @@ static void torture_shuffle_tasks(void)
        struct shuffle_task *stp;
 
        cpumask_setall(shuffle_tmp_mask);
-       get_online_cpus();
+       cpus_read_lock();
 
        /* No point in shuffling if there is only one online CPU (ex: UP) */
        if (num_online_cpus() == 1) {
-               put_online_cpus();
+               cpus_read_unlock();
                return;
        }
 
@@ -541,7 +541,7 @@ static void torture_shuffle_tasks(void)
                set_cpus_allowed_ptr(stp->st_t, shuffle_tmp_mask);
        mutex_unlock(&shuffle_task_mutex);
 
-       put_online_cpus();
+       cpus_read_unlock();
 }
 
 /* Shuffle tasks across CPUs, with the intent of allowing each CPU in the
@@ -816,9 +816,9 @@ bool torture_init_begin(char *ttype, int v)
 {
        mutex_lock(&fullstop_mutex);
        if (torture_type != NULL) {
-               pr_alert("torture_init_begin: Refusing %s init: %s running.\n",
-                        ttype, torture_type);
-               pr_alert("torture_init_begin: One torture test at a time!\n");
+               pr_alert("%s: Refusing %s init: %s running.\n",
+                         __func__, ttype, torture_type);
+               pr_alert("%s: One torture test at a time!\n", __func__);
                mutex_unlock(&fullstop_mutex);
                return false;
        }