The patch titled workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead-fix has been added to the -mm tree. Its filename is workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this 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-fix From: Valdis.Kletnieks@xxxxxx In mmotm1230, there was an apparent mismerge that left a spare '&' on a variable, causing this compiler warning: kernel/workqueue.c: In function 'wq_cpu_map': kernel/workqueue.c:94: warning: pointer type mismatch in conditional expression so let's fix that up. Signed-off-by: Valdis Kletnieks <valdis.kletnieks@xxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/workqueue.c~workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead-fix kernel/workqueue.c --- a/kernel/workqueue.c~workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead-fix +++ a/kernel/workqueue.c @@ -91,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) - ? get_cpu_mask(singlethread_cpu) : &cpu_populated_map; + ? get_cpu_mask(singlethread_cpu) : cpu_populated_map; } static _ Patches currently in -mm which might be from valdis.kletnieks@xxxxxx are workqueues-kill-cpu_singlethread_map-use-get_cpu_mask-instead-fix.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