diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-02-09 20:55:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-09 20:55:03 -0800 |
| commit | 893db07f50596bd42248dcffbe8157abc7204bdd (patch) | |
| tree | ad50914007a8bb39676b8c9e97f71be9610c902e /arch/arm/include | |
| parent | Linux 3.8-rc7 (diff) | |
| parent | ARM: highbank: mask cluster id from cpu_logical_map (diff) | |
| download | linux-dev-893db07f50596bd42248dcffbe8157abc7204bdd.tar.xz linux-dev-893db07f50596bd42248dcffbe8157abc7204bdd.zip | |
Merge tag 'highbank-fixes-for-3.8' of git://sources.calxeda.com/kernel/linux into fixes
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
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/smp_scu.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/include/asm/smp_scu.h b/arch/arm/include/asm/smp_scu.h index 4eb6d005ffaa..86dff32a0737 100644 --- a/arch/arm/include/asm/smp_scu.h +++ b/arch/arm/include/asm/smp_scu.h @@ -7,8 +7,14 @@ #ifndef __ASSEMBLER__ unsigned int scu_get_core_count(void __iomem *); -void scu_enable(void __iomem *); int scu_power_mode(void __iomem *, unsigned int); + +#ifdef CONFIG_SMP +void scu_enable(void __iomem *scu_base); +#else +static inline void scu_enable(void __iomem *scu_base) {} +#endif + #endif #endif |