diff options
author | Mike Kravetz <kravetz@us.ibm.com> | 2005-11-14 19:12:49 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-17 22:45:54 -0500 |
commit | f62859bb6871c5e4a8e591c60befc8caaf54db8c (patch) | |
tree | 765fdc15c121d2b61754f33f98c750f2a728c7b4 /arch | |
parent | 5daf9071b527089b1bd5d9cb3a5354b83121550e (diff) |
[PATCH] Remove SPAN_OTHER_NODES config definition
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@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/Kconfig | 13 | ||||
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 94df74bcc0ee..bb2efdd566a9 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -598,19 +598,6 @@ config ARCH_MEMORY_PROBE | |||
598 | def_bool y | 598 | def_bool y |
599 | depends on MEMORY_HOTPLUG | 599 | depends on MEMORY_HOTPLUG |
600 | 600 | ||
601 | # Some NUMA nodes have memory ranges that span | ||
602 | # other nodes. Even though a pfn is valid and | ||
603 | # between a node's start and end pfns, it may not | ||
604 | # reside on that node. | ||
605 | # | ||
606 | # This is a relatively temporary hack that should | ||
607 | # be able to go away when sparsemem is fully in | ||
608 | # place | ||
609 | |||
610 | config NODES_SPAN_OTHER_NODES | ||
611 | def_bool y | ||
612 | depends on NEED_MULTIPLE_NODES | ||
613 | |||
614 | config PPC_64K_PAGES | 601 | config PPC_64K_PAGES |
615 | bool "64k page size" | 602 | bool "64k page size" |
616 | depends on PPC64 | 603 | depends on PPC64 |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index b4745c918a4a..b589b196eb3f 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -165,7 +165,6 @@ CONFIG_SPARSEMEM_EXTREME=y | |||
165 | # CONFIG_MEMORY_HOTPLUG is not set | 165 | # CONFIG_MEMORY_HOTPLUG is not set |
166 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 166 | CONFIG_SPLIT_PTLOCK_CPUS=4096 |
167 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 167 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
168 | CONFIG_NODES_SPAN_OTHER_NODES=y | ||
169 | # CONFIG_PPC_64K_PAGES is not set | 168 | # CONFIG_PPC_64K_PAGES is not set |
170 | CONFIG_SCHED_SMT=y | 169 | CONFIG_SCHED_SMT=y |
171 | CONFIG_PROC_DEVICETREE=y | 170 | CONFIG_PROC_DEVICETREE=y |