Merge branch 'next' into for-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 395b6974dc8d56ccb2d91ede756069fe9b10c975..8ce10043e4aca1d9d48ab9f127e6079c8634f9fd 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -34,14 +34,11 @@ static struct {
         * an ongoing cpu hotplug operation.
         */
        int refcount;
-} cpu_hotplug;
-
-void __init cpu_hotplug_init(void)
-{
-       cpu_hotplug.active_writer = NULL;
-       mutex_init(&cpu_hotplug.lock);
-       cpu_hotplug.refcount = 0;
-}
+} cpu_hotplug = {
+       .active_writer = NULL,
+       .lock = __MUTEX_INITIALIZER(cpu_hotplug.lock),
+       .refcount = 0,
+};
 
 #ifdef CONFIG_HOTPLUG_CPU