diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-11-11 21:27:03 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-11-11 21:27:03 -0500 |
| commit | c2fdcfc81097255816194a584e6faabd3914cfc5 (patch) | |
| tree | fd8cbf72bf3d38a6d09e4dbbeaa4dd47a04b8f49 /arch/arm/mach-omap2 | |
| parent | f171dfebbdf1de4b6ca267285739e190f95f84cc (diff) | |
| parent | b48635635c1a696aea6423ec6c547c8c7bbf7aab (diff) | |
Merge commit 'v3.1.1' into linaro-3.1
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index ce65e9329c7..889464dc7b2 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -109,12 +109,10 @@ void __init smp_init_cpus(void) ncores = scu_get_core_count(scu_base); /* sanity check */ - if (ncores > NR_CPUS) { - printk(KERN_WARNING - "OMAP4: no. of cores (%d) greater than configured " - "maximum of %d - clipping\n", - ncores, NR_CPUS); - ncores = NR_CPUS; + if (ncores > nr_cpu_ids) { + pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", + ncores, nr_cpu_ids); + ncores = nr_cpu_ids; } for (i = 0; i < ncores; i++) |