Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.2

into intel.com:/home/lenb/src/linux-acpi-test-2.6.3

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.2
into intel.com:/home/lenb/src/linux-acpi-test-2.6.3
e9465823 · Len Brown · 7f425f0f · 594d42ab · e9465823
Commit e9465823 authored Feb 10, 2004 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/acpi/numa.c drivers/acpi/numa.c +1 -1

No files found.
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -172,7 +172,7 @@ acpi_numa_init()
 					       NR_CPUS);
 		result = acpi_table_parse_srat(ACPI_SRAT_MEMORY_AFFINITY,
 					       acpi_parse_memory_affinity,
-					       NR_MEMBLKS);
+					       NR_NODE_MEMBLKS);	// IA64 specific
 	} else {
 		/* FIXME */
 		printk("Warning: acpi_table_parse(ACPI_SRAT) returned %d!\n",result);