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

Commit 314b08ff authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Linus Torvalds
Browse files

watchdog: simplify housekeeping affinity with the appropriate mask 



housekeeping_mask gathers all the CPUs that aren't part of the nohz_full
set.  This is exactly what we want the watchdog to be affine to without
the need to use complicated cpumask operations.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
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 230ec939

kernel/watchdog.c

+2 −4
Original line number Diff line number Diff line
@@ -929,10 +929,8 @@ void __init lockup_detector_init(void) 


#ifdef CONFIG_NO_HZ_FULL

	if (tick_nohz_full_enabled()) {

		if (!cpumask_empty(tick_nohz_full_mask))

		pr_info("Disabling watchdog on nohz_full cores by default\n");

		cpumask_andnot(&watchdog_cpumask, cpu_possible_mask,

			       tick_nohz_full_mask);

		cpumask_copy(&watchdog_cpumask, housekeeping_mask);

	} else

		cpumask_copy(&watchdog_cpumask, cpu_possible_mask);

#else