[PATCH x86/urgent] x86: Disable AMD_NUMA for 32bit for now

[Tejun Heo]

Commit 2706a0bf7b "x86, NUMA: Enable CONFIG_AMD_NUMA on 32bit too"
enabled AMD NUMA for 32bit too.  Unfortunately, SPARSEMEM on 32bit had
rather coarse (512MiB) addr->node mapping granularity due to lack of
space in page->flags.  This led to boot failure on certain AMD NUMA
machines which had 128MiB alignment on nodes.

Patches to properly detect this condition and reject NUMA
configuration are posted[1] but deemed too pervasive for merge at this
point (-rc6).  Disable AMD NUMA for 32bit for now and re-enable once
the detection logic is merged.

[1] http://thread.gmane.org/gmane.linux.kernel/1161279/focus=1162583

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Reported-by: Hans Rosenfeld <hans.rosenfeld@xxxxxxx>
---
 arch/x86/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index da34972..37357a5 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1170,7 +1170,7 @@ comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
 config AMD_NUMA
 	def_bool y
 	prompt "Old style AMD Opteron NUMA detection"
-	depends on NUMA && PCI
+	depends on X86_64 && NUMA && PCI
 	---help---
 	  Enable AMD NUMA node topology detection.  You should say Y here if
 	  you have a multi processor AMD system. This uses an old method to
-- 
1.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/