summaryrefslogtreecommitdiffstats
path: root/kernel/padata.c
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2013-08-23 13:12:33 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2013-08-29 14:37:59 +1000
commitb8b4a4166e3401b7d8ea9deb8d64d875a468144c (patch)
tree9c5456399972573e9fb6ff0cb05c0c717632f980 /kernel/padata.c
parent9c823f9f7e4b392921d0d8b251bec080d58f9077 (diff)
downloadop-kernel-dev-b8b4a4166e3401b7d8ea9deb8d64d875a468144c.zip
op-kernel-dev-b8b4a4166e3401b7d8ea9deb8d64d875a468144c.tar.gz
padata - Register hotcpu notifier after initialization
padata_cpu_callback() takes pinst->lock, to avoid taking an uninitialized lock, register the notifier after it's initialization. Signed-off-by: Richard Weinberger <richard@nod.at> Acked-by: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'kernel/padata.c')
-rw-r--r--kernel/padata.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/padata.c b/kernel/padata.c
index 2f0037a..07af2c9 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -1074,18 +1074,18 @@ struct padata_instance *padata_alloc(struct workqueue_struct *wq,
pinst->flags = 0;
-#ifdef CONFIG_HOTPLUG_CPU
- pinst->cpu_notifier.notifier_call = padata_cpu_callback;
- pinst->cpu_notifier.priority = 0;
- register_hotcpu_notifier(&pinst->cpu_notifier);
-#endif
-
put_online_cpus();
BLOCKING_INIT_NOTIFIER_HEAD(&pinst->cpumask_change_notifier);
kobject_init(&pinst->kobj, &padata_attr_type);
mutex_init(&pinst->lock);
+#ifdef CONFIG_HOTPLUG_CPU
+ pinst->cpu_notifier.notifier_call = padata_cpu_callback;
+ pinst->cpu_notifier.priority = 0;
+ register_hotcpu_notifier(&pinst->cpu_notifier);
+#endif
+
return pinst;
err_free_masks:
OpenPOWER on IntegriCloud