The patch titled Subject: smpboot: dynamically allocate the cpumask has been removed from the -mm tree. Its filename was smpboot-allow-excluding-cpus-from-the-smpboot-threads-fix.patch This patch was dropped because it was folded into smpboot-allow-excluding-cpus-from-the-smpboot-threads.patch ------------------------------------------------------ From: Chris Metcalf <cmetcalf@xxxxxxxxxx> Subject: smpboot: dynamically allocate the cpumask Frederic Weisbecker observed that we'd be better off to dynamically allocate the cpumask associated with smpboot threads to save memory. Signed-off-by: Chris Metcalf <cmetcalf@xxxxxxxxxx> Cc: Don Zickus <dzickus@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Ulrich Obergfell <uobergfe@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/smpboot.h | 2 +- kernel/smpboot.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff -puN include/linux/smpboot.h~smpboot-allow-excluding-cpus-from-the-smpboot-threads-fix include/linux/smpboot.h --- a/include/linux/smpboot.h~smpboot-allow-excluding-cpus-from-the-smpboot-threads-fix +++ a/include/linux/smpboot.h @@ -43,7 +43,7 @@ struct smp_hotplug_thread { void (*park)(unsigned int cpu); void (*unpark)(unsigned int cpu); void (*pre_unpark)(unsigned int cpu); - struct cpumask cpumask; + cpumask_var_t cpumask; bool selfparking; const char *thread_comm; }; diff -puN kernel/smpboot.c~smpboot-allow-excluding-cpus-from-the-smpboot-threads-fix kernel/smpboot.c --- a/kernel/smpboot.c~smpboot-allow-excluding-cpus-from-the-smpboot-threads-fix +++ a/kernel/smpboot.c @@ -232,7 +232,7 @@ void smpboot_unpark_threads(unsigned int mutex_lock(&smpboot_threads_lock); list_for_each_entry(cur, &hotplug_threads, list) - if (cpumask_test_cpu(cpu, &cur->cpumask)) + if (cpumask_test_cpu(cpu, cur->cpumask)) smpboot_unpark_thread(cur, cpu); mutex_unlock(&smpboot_threads_lock); } @@ -260,7 +260,7 @@ static void smpboot_destroy_threads(stru unsigned int cpu; /* Unpark any threads that were voluntarily parked. */ - for_each_cpu_not(cpu, &ht->cpumask) { + for_each_cpu_not(cpu, ht->cpumask) { if (cpu_online(cpu)) { struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu); if (tsk) @@ -291,7 +291,10 @@ int smpboot_register_percpu_thread(struc unsigned int cpu; int ret = 0; - cpumask_copy(&plug_thread->cpumask, cpu_possible_mask); + if (!alloc_cpumask_var(&plug_thread->cpumask, GFP_KERNEL)) + return -ENOMEM; + cpumask_copy(plug_thread->cpumask, cpu_possible_mask); + get_online_cpus(); mutex_lock(&smpboot_threads_lock); for_each_online_cpu(cpu) { @@ -324,6 +327,7 @@ void smpboot_unregister_percpu_thread(st smpboot_destroy_threads(plug_thread); mutex_unlock(&smpboot_threads_lock); put_online_cpus(); + free_cpumask_var(plug_thread->cpumask); } EXPORT_SYMBOL_GPL(smpboot_unregister_percpu_thread); @@ -338,7 +342,7 @@ EXPORT_SYMBOL_GPL(smpboot_unregister_per int smpboot_update_cpumask_percpu_thread(struct smp_hotplug_thread *plug_thread, const struct cpumask *new) { - struct cpumask *old = &plug_thread->cpumask; + struct cpumask *old = plug_thread->cpumask; cpumask_var_t tmp; unsigned int cpu; _ Patches currently in -mm which might be from cmetcalf@xxxxxxxxxx are origin.patch smpboot-allow-excluding-cpus-from-the-smpboot-threads.patch watchdog-add-watchdog_cpumask-sysctl-to-assist-nohz.patch watchdog-add-watchdog_cpumask-sysctl-to-assist-nohz-fix-2.patch watchdog-add-watchdog_cpumask-sysctl-to-assist-nohz-fix-3.patch procfs-treat-parked-tasks-as-sleeping-for-task-state.patch mm-hugetlb-reduce-arch-dependent-code-about-huge_pmd_unshare.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