Merge branch 'akpm-current/current'

[karo-tx-linux.git] / kernel / kexec.c

diff --git a/kernel/kexec.c b/kernel/kexec.c
index bf0b929e7f942a5f831a1e7de1e5efa42d7771a1..369f41a9412481029354034d4c6e0193fe132f56 100644 (file)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1679,6 +1679,14 @@ int kernel_kexec(void)
                kexec_in_progress = true;
                kernel_restart_prepare(NULL);
                migrate_to_reboot_cpu();
+
+               /*
+                * migrate_to_reboot_cpu() disables CPU hotplug assuming that
+                * no further code needs to use CPU hotplug (which is true in
+                * the reboot case). However, the kexec path depends on using
+                * CPU hotplug again; so re-enable it here.
+                */
+               cpu_hotplug_enable();
                pr_emerg("Starting new kernel\n");
                machine_shutdown();
        }