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

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 <>
Reviewed-by: default avatarChris Metcalf <>
Cc: Thomas Gleixner <>
Cc: Chris Metcalf <>
Cc: Don Zickus <>
Cc: Peter Zijlstra <>
Cc: Ulrich Obergfell <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 230ec939
......@@ -929,10 +929,8 @@ void __init lockup_detector_init(void)
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,
pr_info("Disabling watchdog on nohz_full cores by default\n");
cpumask_copy(&watchdog_cpumask, housekeeping_mask);
} else
cpumask_copy(&watchdog_cpumask, cpu_possible_mask);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment