aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-realview
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-02 13:09:37 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-20 10:08:27 -0500
commitfd778f0ad7dda1108281410ddca0d07936256d3c (patch)
treefe85b4ab73930c9fc0ad761dffd2d9394f2e1452 /arch/arm/mach-realview
parent8975b6c0fdd57e061f4d1040163778ceaf340ad8 (diff)
ARM: SMP: get rid of get_core_count()
We don't need this small function as well as scu_get_core_count() Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r--arch/arm/mach-realview/platsmp.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index 13116cd37639..6595e875fb2f 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -50,14 +50,6 @@ static void __iomem *scu_base_addr(void)
50 return (void __iomem *)0; 50 return (void __iomem *)0;
51} 51}
52 52
53static inline unsigned int get_core_count(void)
54{
55 void __iomem *scu_base = scu_base_addr();
56 if (scu_base)
57 return scu_get_core_count(scu_base);
58 return 1;
59}
60
61static DEFINE_SPINLOCK(boot_lock); 53static DEFINE_SPINLOCK(boot_lock);
62 54
63void __cpuinit platform_secondary_init(unsigned int cpu) 55void __cpuinit platform_secondary_init(unsigned int cpu)
@@ -158,7 +150,10 @@ static void __init poke_milo(void)
158 */ 150 */
159void __init smp_init_cpus(void) 151void __init smp_init_cpus(void)
160{ 152{
161 unsigned int i, ncores = get_core_count(); 153 void __iomem *scu_base = scu_base_addr();
154 unsigned int i, ncores;
155
156 ncores = scu_base ? scu_get_core_count(scu_base) : 1;
162 157
163 /* sanity check */ 158 /* sanity check */
164 if (ncores > NR_CPUS) { 159 if (ncores > NR_CPUS) {