Commit fbd7abeb authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[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
parent 41b592ca
...@@ -155,7 +155,7 @@ void __init disable_early_printk(void) ...@@ -155,7 +155,7 @@ void __init disable_early_printk(void)
void setup_system(unsigned long r3, unsigned long r4, unsigned long r5, void setup_system(unsigned long r3, unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7) unsigned long r6, unsigned long r7)
{ {
#ifdef CONFIG_PPC_PSERIES #if defined(CONFIG_SMP) && defined(CONFIG_PPC_PSERIES)
unsigned int ret, i; unsigned int ret, i;
#endif #endif
...@@ -232,8 +232,8 @@ void setup_system(unsigned long r3, unsigned long r4, unsigned long r5, ...@@ -232,8 +232,8 @@ void setup_system(unsigned long r3, unsigned long r4, unsigned long r5,
systemcfg->processorCount++; systemcfg->processorCount++;
} }
} }
}
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
}
#endif /* CONFIG_PPC_PSERIES */ #endif /* CONFIG_PPC_PSERIES */
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment