diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 09:42:30 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 09:42:30 -0400 |
| commit | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (patch) | |
| tree | 847af3ec746c6357902cf57c7e12ba55a35eed30 /arch/arm/mach-realview | |
| parent | cefd3e71efca6f4ef7f06f1fc507771d76072741 (diff) | |
| parent | 28af690a284dfcb627bd69d0963db1c0f412cb8c (diff) | |
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/mach-realview')
| -rw-r--r-- | arch/arm/mach-realview/platsmp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index 4ae943bafa92..e83c654a58d0 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c | |||
| @@ -52,12 +52,10 @@ void __init smp_init_cpus(void) | |||
| 52 | ncores = scu_base ? scu_get_core_count(scu_base) : 1; | 52 | ncores = scu_base ? scu_get_core_count(scu_base) : 1; |
| 53 | 53 | ||
| 54 | /* sanity check */ | 54 | /* sanity check */ |
| 55 | if (ncores > NR_CPUS) { | 55 | if (ncores > nr_cpu_ids) { |
| 56 | printk(KERN_WARNING | 56 | pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", |
| 57 | "Realview: no. of cores (%d) greater than configured " | 57 | ncores, nr_cpu_ids); |
| 58 | "maximum of %d - clipping\n", | 58 | ncores = nr_cpu_ids; |
| 59 | ncores, NR_CPUS); | ||
| 60 | ncores = NR_CPUS; | ||
| 61 | } | 59 | } |
| 62 | 60 | ||
| 63 | for (i = 0; i < ncores; i++) | 61 | for (i = 0; i < ncores; i++) |