---

yaml --- r: 23743 b: refs/heads/master c: d903cea h: refs/heads/master i: 23741: 1b3c1e5 23739: 188a493 23735: 9cc42d4 23727: fa09bfb 23711: 73d25fd 23679: 0941987 v: v3
git-mirror · Mar 22, 2006 · 0b13a2d · 0b13a2d
1 parent 8c95822
commit 0b13a2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a4e5549b7cb5d0ef187184641d8defe8be875f5
+refs/heads/master: d903cea3811994d4c4122a0e3ca6d3a197e812e2
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
@@ -443,6 +443,9 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
 void __init
 acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
 {
+	if (!pa->flags.enabled)
+		return;
+
 	/* record this node in proximity bitmap */
 	pxm_bit_set(pa->proximity_domain);