diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 17:42:30 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 17:42:30 +0400 |
| commit | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (patch) | |
| tree | 847af3ec746c6357902cf57c7e12ba55a35eed30 /arch/arm/mach-vexpress | |
| parent | cefd3e71efca6f4ef7f06f1fc507771d76072741 (diff) | |
| parent | 28af690a284dfcb627bd69d0963db1c0f412cb8c (diff) | |
| download | linux-34471a9168c8bfd7f0d00989a7b0797ad27d585e.tar.xz | |
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/mach-vexpress')
| -rw-r--r-- | arch/arm/mach-vexpress/ct-ca9x4.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index bfd32f52c2db..2b1e836a76ed 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c @@ -221,6 +221,12 @@ static void ct_ca9x4_init_cpu_map(void) { int i, ncores = scu_get_core_count(MMIO_P2V(A9_MPCORE_SCU)); + 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); |