diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-02 19:09:37 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-20 16:08:27 +0100 |
| commit | fd778f0ad7dda1108281410ddca0d07936256d3c (patch) | |
| tree | fe85b4ab73930c9fc0ad761dffd2d9394f2e1452 /arch/arm/mach-realview | |
| parent | ARM: SMP: Clean up ncores sanity checks (diff) | |
| download | linux-fd778f0ad7dda1108281410ddca0d07936256d3c.tar.xz linux-fd778f0ad7dda1108281410ddca0d07936256d3c.zip | |
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.c | 13 |
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) return (void __iomem *)0; } -static inline unsigned int get_core_count(void) -{ - void __iomem *scu_base = scu_base_addr(); - if (scu_base) - return scu_get_core_count(scu_base); - return 1; -} - static DEFINE_SPINLOCK(boot_lock); void __cpuinit platform_secondary_init(unsigned int cpu) @@ -158,7 +150,10 @@ static void __init poke_milo(void) */ void __init smp_init_cpus(void) { - unsigned int i, ncores = get_core_count(); + void __iomem *scu_base = scu_base_addr(); + unsigned int i, ncores; + + ncores = scu_base ? scu_get_core_count(scu_base) : 1; /* sanity check */ if (ncores > NR_CPUS) { |