diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-02 13:09:37 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-20 10:08:27 -0500 |
commit | fd778f0ad7dda1108281410ddca0d07936256d3c (patch) | |
tree | fe85b4ab73930c9fc0ad761dffd2d9394f2e1452 /arch/arm/mach-omap2/omap-smp.c | |
parent | 8975b6c0fdd57e061f4d1040163778ceaf340ad8 (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-omap2/omap-smp.c')
-rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index 5f10f38354ae..405a8fc53308 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c | |||
@@ -29,16 +29,6 @@ | |||
29 | /* SCU base address */ | 29 | /* SCU base address */ |
30 | static void __iomem *scu_base; | 30 | static void __iomem *scu_base; |
31 | 31 | ||
32 | /* | ||
33 | * Use SCU config register to count number of cores | ||
34 | */ | ||
35 | static inline unsigned int get_core_count(void) | ||
36 | { | ||
37 | if (scu_base) | ||
38 | return scu_get_core_count(scu_base); | ||
39 | return 1; | ||
40 | } | ||
41 | |||
42 | static DEFINE_SPINLOCK(boot_lock); | 32 | static DEFINE_SPINLOCK(boot_lock); |
43 | 33 | ||
44 | void __cpuinit platform_secondary_init(unsigned int cpu) | 34 | void __cpuinit platform_secondary_init(unsigned int cpu) |
@@ -118,7 +108,7 @@ void __init smp_init_cpus(void) | |||
118 | scu_base = ioremap(OMAP44XX_SCU_BASE, SZ_256); | 108 | scu_base = ioremap(OMAP44XX_SCU_BASE, SZ_256); |
119 | BUG_ON(!scu_base); | 109 | BUG_ON(!scu_base); |
120 | 110 | ||
121 | ncores = get_core_count(); | 111 | ncores = scu_get_core_count(scu_base); |
122 | 112 | ||
123 | /* sanity check */ | 113 | /* sanity check */ |
124 | if (ncores > NR_CPUS) { | 114 | if (ncores > NR_CPUS) { |