]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[S390] dont use kthread for smp_rescan_cpus().
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Fri, 1 Aug 2008 14:39:23 +0000 (16:39 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 1 Aug 2008 14:39:36 +0000 (16:39 +0200)
Since git commit 3da1c84c00c7e5fa8348336bd8c342f9128b0f14
"workqueues: make get_online_cpus() useable for work->func()"
it is safe to call get_online_cpus() from workqueue context.
So remove the kthread workaround again.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/sclp_config.c

index fff4ff485d9bcbb8e3bc25c05d465b8214f8774b..4cebd6ee6d27e79b33bf037e74754743a947f9fd 100644 (file)
@@ -8,7 +8,6 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/cpu.h>
-#include <linux/kthread.h>
 #include <linux/sysdev.h>
 #include <linux/workqueue.h>
 #include <asm/smp.h>
@@ -41,19 +40,9 @@ static void sclp_cpu_capability_notify(struct work_struct *work)
        put_online_cpus();
 }
 
-static int sclp_cpu_kthread(void *data)
-{
-       smp_rescan_cpus();
-       return 0;
-}
-
 static void __ref sclp_cpu_change_notify(struct work_struct *work)
 {
-       /* Can't call smp_rescan_cpus() from  workqueue context since it may
-        * deadlock in case of cpu hotplug. So we have to create a kernel
-        * thread in order to call it.
-        */
-       kthread_run(sclp_cpu_kthread, NULL, "cpu_rescan");
+       smp_rescan_cpus();
 }
 
 static void sclp_conf_receiver_fn(struct evbuf_header *evbuf)