[PATCH] sparsemem memory model for i386

Provide the architecture specific implementation for SPARSEMEM for i386 SMP
and NUMA systems.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Martin Bligh <mbligh@aracnet.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 17 insertions, 7 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f0064b5e3702..bfdcedef06e1 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -68,7 +68,6 @@ config X86_VOYAGER
 
 config X86_NUMAQ
         bool "NUMAQ (IBM/Sequent)"
-        select DISCONTIGMEM
         select NUMA
         help
           This option is used for getting Linux to run on a (IBM/Sequent) NUMA
@@ -783,11 +782,6 @@ comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
         depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
 
-config ARCH_DISCONTIGMEM_ENABLE
-        bool
-        depends on NUMA
-        default y
-
 config HAVE_ARCH_BOOTMEM_NODE
         bool
         depends on NUMA
@@ -800,7 +794,7 @@ config ARCH_HAVE_MEMORY_PRESENT
 
 config NEED_NODE_MEMMAP_SIZE
         bool
-        depends on DISCONTIGMEM
+        depends on DISCONTIGMEM || SPARSEMEM
         default y
 
 config HAVE_ARCH_ALLOC_REMAP
@@ -808,6 +802,22 @@ config HAVE_ARCH_ALLOC_REMAP
         depends on NUMA
         default y
 
+config ARCH_DISCONTIGMEM_ENABLE
+        def_bool y
+        depends on NUMA
+
+config ARCH_DISCONTIGMEM_DEFAULT
+        def_bool y
+        depends on NUMA
+
+config ARCH_SPARSEMEM_ENABLE
+        def_bool y
+        depends on NUMA
+
+config ARCH_SELECT_MEMORY_MODEL
+        def_bool y
+        depends on ARCH_SPARSEMEM_ENABLE
+
 source "mm/Kconfig"
 
 config HAVE_ARCH_EARLY_PFN_TO_NID