From: Hollis Blanchard <hollisb@us.ibm.com>
fix warning and compile error without CONFIG_SMP
---
arch/ppc64/kernel/setup.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/ppc64/kernel/setup.c~ppc64-upfix arch/ppc64/kernel/setup.c
--- 25/arch/ppc64/kernel/setup.c~ppc64-upfix 2004-02-21 20:58:23.000000000 -0800
+++ 25-akpm/arch/ppc64/kernel/setup.c 2004-02-21 20:58:23.000000000 -0800
@@ -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, unsi
systemcfg->processorCount++;
}
}
- }
#endif /* CONFIG_SMP */
+ }
#endif /* CONFIG_PPC_PSERIES */
#ifdef CONFIG_PPC_PMAC
_