Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2a45b85 authored by Ulrich Obergfell's avatar Ulrich Obergfell Committed by Linus Torvalds
Browse files

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: default avatarUlrich Obergfell <uobergfe@redhat.com>
Acked-by: default avatarDon Zickus <dzickus@redhat.com>
Reviewed-by: default avatarAaron Tomlin <atomlin@redhat.com>
Cc: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8614ddef

kernel/watchdog.c

+6 −4
Original line number Diff line number Diff line
@@ -683,33 +683,35 @@ static struct smp_hotplug_thread watchdog_threads = { 
 * be parked and the watchdog threads of other CPUs can still be runnable.

 * Callers are expected to handle this special condition as appropriate in

 * 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)

{

	int cpu, ret = 0;



	get_online_cpus();

	for_each_watchdog_cpu(cpu) {

		ret = kthread_park(per_cpu(softlockup_watchdog, cpu));

		if (ret)

			break;

	}

	put_online_cpus();



	return ret;

}



/*

 * 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)

{

	int cpu;



	get_online_cpus();

	for_each_watchdog_cpu(cpu)

		kthread_unpark(per_cpu(softlockup_watchdog, cpu));

	put_online_cpus();

}



/*