From 0b13a2d2da1474bfb40f177082703d2ace480385 Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@soft.fujitsu.com>
Date: Wed, 15 Mar 2006 14:45:11 +0900
Subject: [PATCH] --- yaml --- r: 23743 b: refs/heads/master c:
 d903cea3811994d4c4122a0e3ca6d3a197e812e2 h: refs/heads/master i:   23741:
 1b3c1e59bb46665c0ec206d96089ec70ef8f4090   23739:
 188a4937fc80cfe9a05d91a3724b6a1fc87e6b93   23735:
 9cc42d4f6a633963b7f93a5c3467aeebd1323349   23727:
 fa09bfb79a4a42a5a923380ff37a68fb9759d2ca   23711:
 73d25fde3d648d2544b45a31785a921cdde177d7   23679:
 0941987a9cd00270ca02955c8d923d113d8899ed v: v3

---
 [refs]                        | 2 +-
 trunk/arch/ia64/kernel/acpi.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 970e9fc61f7c..0a23d613f493 100644
--- 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
index 4722ec51c70c..24fe7c81e108 100644
--- 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);