[PATCH] Remove SPAN_OTHER_NODES config definition

Mike Kravetz kravetz at us.ibm.com
Tue Nov 15 11:12:49 EST 2005


The config option SPAN_OTHER_NODES was created so that we could
make pSeries numa layouts work within the DISCONTIG memory model.
Now that DISCONTIG has been replaced by SPARSEMEM, we can eliminate
this option.

I'll be sending a separate patch to Andrew to remove the arch
independent code as pSeries was the only arch that needed this.

Signed-off-by: Mike Kravetz <kravetz at us.ibm.com>

diff -Naupr linux-2.6.15-rc1-git2/arch/powerpc/Kconfig linux-2.6.15-rc1-git2.work/arch/powerpc/Kconfig
--- linux-2.6.15-rc1-git2/arch/powerpc/Kconfig	2005-11-12 01:43:36.000000000 +0000
+++ linux-2.6.15-rc1-git2.work/arch/powerpc/Kconfig	2005-11-14 22:47:31.000000000 +0000
@@ -598,19 +598,6 @@ config ARCH_MEMORY_PROBE
 	def_bool y
 	depends on MEMORY_HOTPLUG
 
-# Some NUMA nodes have memory ranges that span
-# other nodes.  Even though a pfn is valid and
-# between a node's start and end pfns, it may not
-# reside on that node.
-#
-# This is a relatively temporary hack that should
-# be able to go away when sparsemem is fully in
-# place
-
-config NODES_SPAN_OTHER_NODES
-	def_bool y
-	depends on NEED_MULTIPLE_NODES
-
 config PPC_64K_PAGES
 	bool "64k page size"
 	depends on PPC64
diff -Naupr linux-2.6.15-rc1-git2/arch/powerpc/configs/pseries_defconfig linux-2.6.15-rc1-git2.work/arch/powerpc/configs/pseries_defconfig
--- linux-2.6.15-rc1-git2/arch/powerpc/configs/pseries_defconfig	2005-11-12 01:43:36.000000000 +0000
+++ linux-2.6.15-rc1-git2.work/arch/powerpc/configs/pseries_defconfig	2005-11-14 22:47:05.000000000 +0000
@@ -108,7 +108,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
-CONFIG_NODES_SPAN_OTHER_NODES=y
 CONFIG_NUMA=y
 CONFIG_SCHED_SMT=y
 CONFIG_PREEMPT_NONE=y



More information about the Linuxppc64-dev mailing list