Browse Source

kernel/watchdog.c: remove {get|put}_online_cpus() from watchdog_{park|unpark}_threads()

watchdog_{park|unpark}_threads() are now called in code paths that protect
themselves against CPU hotplug, so {get|put}_online_cpus() calls are
redundant and can be removed.

Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
Acked-by: Don Zickus <dzickus@redhat.com>
Reviewed-by: Aaron Tomlin <atomlin@redhat.com>
Cc: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Ulrich Obergfell 9 years ago
parent
commit
a2a45b85ec
1 changed files with 6 additions and 4 deletions
  1. 6 4
      kernel/watchdog.c

+ 6 - 4
kernel/watchdog.c

@@ -683,33 +683,35 @@ static struct smp_hotplug_thread watchdog_threads = {
  * be parked and the watchdog threads of other CPUs can still be runnable.
  * be parked and the watchdog threads of other CPUs can still be runnable.
  * Callers are expected to handle this special condition as appropriate in
  * Callers are expected to handle this special condition as appropriate in
  * their context.
  * their context.
+ *
+ * This function may only be called in a context that is protected against
+ * races with CPU hotplug - for example, via get_online_cpus().
  */
  */
 static int watchdog_park_threads(void)
 static int watchdog_park_threads(void)
 {
 {
 	int cpu, ret = 0;
 	int cpu, ret = 0;
 
 
-	get_online_cpus();
 	for_each_watchdog_cpu(cpu) {
 	for_each_watchdog_cpu(cpu) {
 		ret = kthread_park(per_cpu(softlockup_watchdog, cpu));
 		ret = kthread_park(per_cpu(softlockup_watchdog, cpu));
 		if (ret)
 		if (ret)
 			break;
 			break;
 	}
 	}
-	put_online_cpus();
 
 
 	return ret;
 	return ret;
 }
 }
 
 
 /*
 /*
  * unpark all watchdog threads that are specified in 'watchdog_cpumask'
  * unpark all watchdog threads that are specified in 'watchdog_cpumask'
+ *
+ * This function may only be called in a context that is protected against
+ * races with CPU hotplug - for example, via get_online_cpus().
  */
  */
 static void watchdog_unpark_threads(void)
 static void watchdog_unpark_threads(void)
 {
 {
 	int cpu;
 	int cpu;
 
 
-	get_online_cpus();
 	for_each_watchdog_cpu(cpu)
 	for_each_watchdog_cpu(cpu)
 		kthread_unpark(per_cpu(softlockup_watchdog, cpu));
 		kthread_unpark(per_cpu(softlockup_watchdog, cpu));
-	put_online_cpus();
 }
 }
 
 
 /*
 /*