The patch titled Subject: watchdog: simplify housekeeping affinity with the appropriate mask has been removed from the -mm tree. Its filename was watchdog-simplify-housekeeping-affinity-with-the-appropriate-mask.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Frederic Weisbecker <fweisbec@xxxxxxxxx> Subject: 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: Frederic Weisbecker <fweisbec@xxxxxxxxx> Reviewed-by: Chris Metcalf <cmetcalf@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Chris Metcalf <cmetcalf@xxxxxxxxxx> Cc: Don Zickus <dzickus@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Ulrich Obergfell <uobergfe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/watchdog.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN kernel/watchdog.c~watchdog-simplify-housekeeping-affinity-with-the-appropriate-mask kernel/watchdog.c --- a/kernel/watchdog.c~watchdog-simplify-housekeeping-affinity-with-the-appropriate-mask +++ a/kernel/watchdog.c @@ -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); + 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); #else _ Patches currently in -mm which might be from fweisbec@xxxxxxxxx are kmod-bunch-of-internal-functions-renames.patch kmod-remove-unecessary-explicit-wide-cpu-affinity-setting.patch kmod-add-up-to-date-explanations-on-the-purpose-of-each-asynchronous-levels.patch kmod-use-system_unbound_wq-instead-of-khelper.patch kmod-handle-umh_wait_proc-from-system-unbound-workqueue.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html