diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-21 01:04:18 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-21 01:06:57 +0400 |
| commit | a06f916b7a9b57447ceb875eb0a89f1a66b31bca (patch) | |
| tree | a8a9d7c5e91a08f253107ffcf066dbeb4f7d9d34 /arch/arm/mach-shmobile/platsmp.c | |
| parent | 5a567d78c437e3be1c512734cdfe64b4ae6b82d7 (diff) | |
| download | linux-a06f916b7a9b57447ceb875eb0a89f1a66b31bca.tar.xz | |
ARM: smp: fix clipping of number of CPUs
Rather than clipping the number of CPUs using the compile-time NR_CPUS
constant, use the runtime nr_cpu_ids value instead. This allows the
nr_cpus command line option to work as expected.
Cc: <stable@kernel.org>
Reported-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-shmobile/platsmp.c')
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index 66f980625a33..e4e485fa2532 100644 --- a/arch/arm/mach-shmobile/platsmp.c +++ b/arch/arm/mach-shmobile/platsmp.c @@ -56,6 +56,12 @@ void __init smp_init_cpus(void) unsigned int ncores = shmobile_smp_get_core_count(); unsigned int i; + 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++) set_cpu_possible(i, true); |