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-tegra | |
| 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-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/platsmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index 0886cbccddee..7d2b5d03c1df 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c | |||
| @@ -114,10 +114,10 @@ void __init smp_init_cpus(void) | |||
| 114 | { | 114 | { |
| 115 | unsigned int i, ncores = scu_get_core_count(scu_base); | 115 | unsigned int i, ncores = scu_get_core_count(scu_base); |
| 116 | 116 | ||
| 117 | if (ncores > NR_CPUS) { | 117 | if (ncores > nr_cpu_ids) { |
| 118 | printk(KERN_ERR "Tegra: no. of cores (%u) greater than configured (%u), clipping\n", | 118 | pr_warn("SMP: %u cores greater than maximum (%u), clipping\n", |
| 119 | ncores, NR_CPUS); | 119 | ncores, nr_cpu_ids); |
| 120 | ncores = NR_CPUS; | 120 | ncores = nr_cpu_ids; |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | for (i = 0; i < ncores; i++) | 123 | for (i = 0; i < ncores; i++) |