diff options
Diffstat (limited to 'arch/x86/kernel/reboot.c')
-rw-r--r-- | arch/x86/kernel/reboot.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 484c4a80d38a..9692202d3bfb 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
2 | #include <linux/init.h> | ||
3 | #include <linux/reboot.h> | 2 | #include <linux/reboot.h> |
4 | #include <linux/init.h> | 3 | #include <linux/init.h> |
5 | #include <linux/pm.h> | 4 | #include <linux/pm.h> |
@@ -412,12 +411,12 @@ static void native_machine_shutdown(void) | |||
412 | #ifdef CONFIG_X86_32 | 411 | #ifdef CONFIG_X86_32 |
413 | /* See if there has been given a command line override */ | 412 | /* See if there has been given a command line override */ |
414 | if ((reboot_cpu != -1) && (reboot_cpu < NR_CPUS) && | 413 | if ((reboot_cpu != -1) && (reboot_cpu < NR_CPUS) && |
415 | cpu_isset(reboot_cpu, cpu_online_map)) | 414 | cpu_online(reboot_cpu)) |
416 | reboot_cpu_id = reboot_cpu; | 415 | reboot_cpu_id = reboot_cpu; |
417 | #endif | 416 | #endif |
418 | 417 | ||
419 | /* Make certain the cpu I'm about to reboot on is online */ | 418 | /* Make certain the cpu I'm about to reboot on is online */ |
420 | if (!cpu_isset(reboot_cpu_id, cpu_online_map)) | 419 | if (!cpu_online(reboot_cpu_id)) |
421 | reboot_cpu_id = smp_processor_id(); | 420 | reboot_cpu_id = smp_processor_id(); |
422 | 421 | ||
423 | /* Make certain I only run on the appropriate processor */ | 422 | /* Make certain I only run on the appropriate processor */ |