2 files changed, 12 insertions, 31 deletions

diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index 1d71c051a951..ed7507b69b48 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -344,39 +344,31 @@ EXPORT_SYMBOL_GPL(smpboot_unregister_percpu_thread);
  * by the client, but only by calling this function.
  * This function can only be called on a registered smp_hotplug_thread.
  */
-int smpboot_update_cpumask_percpu_thread(struct smp_hotplug_thread *plug_thread,
-                                         const struct cpumask *new)
+void smpboot_update_cpumask_percpu_thread(struct smp_hotplug_thread *plug_thread,
+                                          const struct cpumask *new)
 {
         struct cpumask *old = plug_thread->cpumask;
-        cpumask_var_t tmp;
+        static struct cpumask tmp;
         unsigned int cpu;
 
-        if (!alloc_cpumask_var(&tmp, GFP_KERNEL))
-                return -ENOMEM;
-
         get_online_cpus();
         mutex_lock(&smpboot_threads_lock);
 
         /* Park threads that were exclusively enabled on the old mask. */
-        cpumask_andnot(tmp, old, new);
-        for_each_cpu_and(cpu, tmp, cpu_online_mask)
+        cpumask_andnot(&tmp, old, new);
+        for_each_cpu_and(cpu, &tmp, cpu_online_mask)
                 smpboot_park_thread(plug_thread, cpu);
 
         /* Unpark threads that are exclusively enabled on the new mask. */
-        cpumask_andnot(tmp, new, old);
-        for_each_cpu_and(cpu, tmp, cpu_online_mask)
+        cpumask_andnot(&tmp, new, old);
+        for_each_cpu_and(cpu, &tmp, cpu_online_mask)
                 smpboot_unpark_thread(plug_thread, cpu);
 
         cpumask_copy(old, new);
 
         mutex_unlock(&smpboot_threads_lock);
         put_online_cpus();
-
-        free_cpumask_var(tmp);
-
-        return 0;
 }
-EXPORT_SYMBOL_GPL(smpboot_update_cpumask_percpu_thread);
 
 static DEFINE_PER_CPU(atomic_t, cpu_hotplug_state) = ATOMIC_INIT(CPU_POST_DEAD);
 
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index cedf45ab4d81..8935a3a4c2fb 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -787,31 +787,20 @@ out:
         return err;
 }
 
-static int watchdog_update_cpus(void)
+static void watchdog_update_cpus(void)
 {
-        if (IS_ENABLED(CONFIG_SOFTLOCKUP_DETECTOR)) {
-                return smpboot_update_cpumask_percpu_thread(&watchdog_threads,
-                                                            &watchdog_cpumask);
+        if (IS_ENABLED(CONFIG_SOFTLOCKUP_DETECTOR) && watchdog_running) {
+                smpboot_update_cpumask_percpu_thread(&watchdog_threads,
+                                                     &watchdog_cpumask);
                 __lockup_detector_cleanup();
         }
-        return 0;
 }
 
 static void proc_watchdog_cpumask_update(void)
 {
         /* Remove impossible cpus to keep sysctl output clean. */
         cpumask_and(&watchdog_cpumask, &watchdog_cpumask, cpu_possible_mask);
-
-        if (watchdog_running) {
-                /*
-                 * Failure would be due to being unable to allocate a
-                 * temporary cpumask, so we are likely not in a position to
-                 * do much else to make things better.
-                 */
-                if (watchdog_update_cpus() != 0)
-                        pr_err("cpumask update failed\n");
-        }
-
+        watchdog_update_cpus();
         watchdog_nmi_reconfigure();
 }