aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-03 14:29:53 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-20 10:08:27 -0500
commit8975b6c0fdd57e061f4d1040163778ceaf340ad8 (patch)
tree23e2b750f79b69c6610ecb8061b3aa2d027f9dc8 /arch/arm/mach-ux500
parentbbc3d14e9aca023bb98e580aa1c9350af8effdb1 (diff)
ARM: SMP: Clean up ncores sanity checks
scu_get_core_count() never returns zero cores, so we don't need to check and correct if ncores is zero. Tegra was missing the check against NR_CPUS, leading to a potential bitfield overflow if this becomes the case. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/platsmp.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index a51962b7579b..e31024e3a7cc 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -129,12 +129,6 @@ void __init smp_init_cpus(void)
129 unsigned int i, ncores = get_core_count(); 129 unsigned int i, ncores = get_core_count();
130 130
131 /* sanity check */ 131 /* sanity check */
132 if (ncores == 0) {
133 printk(KERN_ERR
134 "U8500: strange CM count of 0? Default to 1\n");
135 ncores = 1;
136 }
137
138 if (ncores > NR_CPUS) { 132 if (ncores > NR_CPUS) {
139 printk(KERN_WARNING 133 printk(KERN_WARNING
140 "U8500: no. of cores (%d) greater than configured " 134 "U8500: no. of cores (%d) greater than configured "