[PATCH] ppc64: fix warning and compile error without CONFIG_SMP

From: Hollis Blanchard <hollisb@us.ibm.com>

fix warning and compile error without CONFIG_SMP

diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index fab2ace292d65745e5e1dfc3472135b1a6d70c70..cf165ca5353d8b1f4185f9d421de4ba0b5f9329f 100644 (file)
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -155,7 +155,7 @@ void __init disable_early_printk(void)
 void setup_system(unsigned long r3, unsigned long r4, unsigned long r5,
                  unsigned long r6, unsigned long r7)
 {
-#ifdef CONFIG_PPC_PSERIES
+#if defined(CONFIG_SMP) && defined(CONFIG_PPC_PSERIES)
        unsigned int ret, i;
 #endif
 
@@ -232,8 +232,8 @@ void setup_system(unsigned long r3, unsigned long r4, unsigned long r5,
                                systemcfg->processorCount++;
                        }
                }
-       }
 #endif /* CONFIG_SMP */
+       }
 #endif /* CONFIG_PPC_PSERIES */
 
 #ifdef CONFIG_PPC_PMAC