Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / arch / x86 / kernel / reboot.c

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 9dcf39c0297260f63f691b67ffbaed4ead8a4390..724adfc63cb9a7b60d6ee5c82efd919fe237f69c 100644 (file)
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -411,10 +411,9 @@ void native_machine_shutdown(void)
 {
        /* Stop the cpus and apics */
 #ifdef CONFIG_SMP
-       int reboot_cpu_id;
 
        /* The boot cpu is always logical cpu 0 */
-       reboot_cpu_id = 0;
+       int reboot_cpu_id = 0;
 
 #ifdef CONFIG_X86_32
        /* See if there has been given a command line override */