The patch titled workqueues: kill cpu_singlethread_map, use get_cpu_mask() instead has been removed from the -mm tree. Its filename was workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: workqueues: kill cpu_singlethread_map, use get_cpu_mask() instead From: Oleg Nesterov <oleg@xxxxxxxxxx> Now that we have cpu_bit_bitmap[] we don't need cpu_singlethread_map, we can use get_cpu_mask(singlethread_cpu) directly. Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/workqueue.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff -puN kernel/workqueue.c~workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead kernel/workqueue.c --- a/kernel/workqueue.c~workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead +++ a/kernel/workqueue.c @@ -73,7 +73,6 @@ static DEFINE_SPINLOCK(workqueue_lock); static LIST_HEAD(workqueues); static int singlethread_cpu __read_mostly; -static const struct cpumask *cpu_singlethread_map __read_mostly; /* * _cpu_down() first removes CPU from cpu_online_map, then CPU_DEAD * flushes cwq->worklist. This means that flush_workqueue/wait_on_work @@ -92,7 +91,7 @@ static inline int is_wq_single_threaded( static const struct cpumask *wq_cpu_map(struct workqueue_struct *wq) { return is_wq_single_threaded(wq) - ? cpu_singlethread_map : cpu_populated_map; + ? get_cpu_mask(singlethread_cpu) : &cpu_populated_map; } static @@ -1021,7 +1020,6 @@ void __init init_workqueues(void) cpumask_copy(cpu_populated_map, cpu_online_mask); singlethread_cpu = cpumask_first(cpu_possible_mask); - cpu_singlethread_map = cpumask_of(singlethread_cpu); hotcpu_notifier(workqueue_cpu_callback, 0); keventd_wq = create_workqueue("events"); BUG_ON(!keventd_wq); _ Patches currently in -mm which might be from oleg@xxxxxxxxxx are origin.patch linux-next.patch introduce-get_mm_hiwater_xxx-fix-taskstats-hiwater_xxx-accounting.patch forkc-cleanup-for-copy_sighand.patch poll-allow-f_op-poll-to-sleep-take6.patch workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead.patch workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead-fix.patch pid-implement-ns_of_pid.patch pid-generalize-task_active_pid_ns.patch mqueue-fix-si_pid-value-in-mqueue-do_notify.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