workqueue: workqueue_cpu_callback() should be cpu_notifier instead of hotcpu_notifier
authorTejun Heo <tj@kernel.org>
Mon, 9 Aug 2010 09:50:34 +0000 (11:50 +0200)
committerTejun Heo <tj@kernel.org>
Mon, 9 Aug 2010 09:50:34 +0000 (11:50 +0200)
Commit 6ee0578b (workqueue: mark init_workqueues as early_initcall)
made workqueue SMP initialization depend on workqueue_cpu_callback(),
which however was registered as hotcpu_notifier() and didn't get
called if CONFIG_HOTPLUG_CPU is not set.  This made gcwqs on non-boot
CPUs not create their initial workers leading to boot failures.  Fix
it by making it a cpu_notifier.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-and-bisected-by: walt <w41ter@gmail.com>
Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
kernel/workqueue.c

index da6c482944d7df998d3838061e49f6af5aceea71..2994a0e3a61cc2cfdeb382936394456875a4c01c 100644 (file)
@@ -3527,7 +3527,7 @@ static int __init init_workqueues(void)
        unsigned int cpu;
        int i;
 
-       hotcpu_notifier(workqueue_cpu_callback, CPU_PRI_WORKQUEUE);
+       cpu_notifier(workqueue_cpu_callback, CPU_PRI_WORKQUEUE);
 
        /* initialize gcwqs */
        for_each_gcwq_cpu(cpu) {