diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 14:52:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 14:52:44 -0800 |
| commit | ecacc6c70cf77a52a22af66c879873202522d6ce (patch) | |
| tree | 47cffb395cd3b9079d5c1205708181c0f49394e8 /arch/ia64/kernel/acpi.c | |
| parent | e773202e227c8ebbf369b9b924e15cca4d93824b (diff) | |
| parent | 4bfc2b2eccf48fef84b9adfe4f1bd8d5e6e1bc8d (diff) | |
| download | op-kernel-dev-ecacc6c70cf77a52a22af66c879873202522d6ce.zip op-kernel-dev-ecacc6c70cf77a52a22af66c879873202522d6ce.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Avoid array overflow if there are too many cpus in SRAT table
[IA64] Remove unlikely from cpu_is_offline
[IA64] irq_ia64, use set_irq_chip
[IA64] perfmon: Change vmalloc to vzalloc and drop memset.
[IA64] eliminate race condition in smp_flush_tlb_mm
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index c6c90f3..7b897b7 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -477,6 +477,12 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) if (!(pa->flags & ACPI_SRAT_CPU_ENABLED)) return; + if (srat_num_cpus >= ARRAY_SIZE(node_cpuid)) { + printk_once(KERN_WARNING + "node_cpuid[%d] is too small, may not be able to use all cpus\n", + ARRAY_SIZE(node_cpuid)); + return; + } pxm = get_processor_proximity_domain(pa); /* record this node in proximity bitmap */ |
