From Rob Herring: highbank fixes for 3.8 -Compile fix for !SMP -More cpu cluster id related fixes * tag 'highbank-fixes-for-3.8' of git://sources.calxeda.com/kernel/linux: ARM: highbank: mask cluster id from cpu_logical_map ARM: scu: mask cluster id from cpu_logical_map ARM: scu: add empty scu_enable for !CONFIG_SMP
Showing the changes to arch/arm/include (1 of 4 files). Show all
Unified · Split
| @@ -7,8 +7,14 @@ · 6 unmodified lines | ||
| 7 | 7 | |
| 8 | 8 | #ifndef __ASSEMBLER__ |
| 9 | 9 | unsigned int scu_get_core_count(void __iomem *); |
| 10 | −void scu_enable(void __iomem *); | |
| 11 | 10 | int scu_power_mode(void __iomem *, unsigned int); |
| 11 | + | |
| 12 | +#ifdef CONFIG_SMP | |
| 13 | +void scu_enable(void __iomem *scu_base); | |
| 14 | +#else | |
| 15 | +static inline void scu_enable(void __iomem *scu_base) {} | |
| 16 | +#endif | |
| 17 | + | |
| 12 | 18 | #endif |
| 13 | 19 | |
| 14 | 20 | #endif |