From 61cbb2f30bee39419f238cb6ea3a53e2c9cf3ca1 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Fri, 7 Jan 2011 09:11:55 -0800 Subject: [PATCH] --- yaml --- r: 227832 b: refs/heads/master c: 05f2f274c8a8747bbfb13ac8ee0c27d5f2ad8510 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/acpi.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 79e3f580a546..073acc9f3b72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7d282535c94cddc208c03b7cd0815f70d676a0e +refs/heads/master: 05f2f274c8a8747bbfb13ac8ee0c27d5f2ad8510 diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c index c6c90f39f4d9..7b897b7b0ae6 100644 --- a/trunk/arch/ia64/kernel/acpi.c +++ b/trunk/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 */