diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kexec.c | 1 | ||||
| -rw-r--r-- | kernel/reboot.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index d0d8fca54065..9c970167e402 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
| @@ -1680,6 +1680,7 @@ int kernel_kexec(void) | |||
| 1680 | { | 1680 | { |
| 1681 | kexec_in_progress = true; | 1681 | kexec_in_progress = true; |
| 1682 | kernel_restart_prepare(NULL); | 1682 | kernel_restart_prepare(NULL); |
| 1683 | migrate_to_reboot_cpu(); | ||
| 1683 | printk(KERN_EMERG "Starting new kernel\n"); | 1684 | printk(KERN_EMERG "Starting new kernel\n"); |
| 1684 | machine_shutdown(); | 1685 | machine_shutdown(); |
| 1685 | } | 1686 | } |
diff --git a/kernel/reboot.c b/kernel/reboot.c index f813b3474646..662c83fc16b7 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c | |||
| @@ -104,7 +104,7 @@ int unregister_reboot_notifier(struct notifier_block *nb) | |||
| 104 | } | 104 | } |
| 105 | EXPORT_SYMBOL(unregister_reboot_notifier); | 105 | EXPORT_SYMBOL(unregister_reboot_notifier); |
| 106 | 106 | ||
| 107 | static void migrate_to_reboot_cpu(void) | 107 | void migrate_to_reboot_cpu(void) |
| 108 | { | 108 | { |
| 109 | /* The boot cpu is always logical cpu 0 */ | 109 | /* The boot cpu is always logical cpu 0 */ |
| 110 | int cpu = reboot_cpu; | 110 | int cpu = reboot_cpu; |
