---

 memhotplug-dave/mm/Kconfig |    4 ++++
 1 files changed, 4 insertions(+)

diff -puN mm/Kconfig~M1-no_nonlinear_and_NUMA_for_now mm/Kconfig
--- memhotplug/mm/Kconfig~M1-no_nonlinear_and_NUMA_for_now	2005-01-04 13:49:54.000000000 -0800
+++ memhotplug-dave/mm/Kconfig	2005-01-04 13:49:54.000000000 -0800
@@ -1,5 +1,9 @@
 config NONLINEAR
 	bool "Allow nonlinear physical memory"
+	depends on !NUMA
+
+comment "Nonlinear is currently incompatible with NUMA"
+	depends on NUMA
 
 config CONTIGUOUS_MEM_MAP
 	bool
_