[PATCH] make each arch use mm/Kconfig

For all architectures, this just means that you'll see a "Memory Model"
choice in your architecture menu.  For those that implement DISCONTIGMEM,
you may eventually want to make your ARCH_DISCONTIGMEM_ENABLE a "def_bool
y" and make your users select DISCONTIGMEM right out of the new choice
menu.  The only disadvantage might be if you have some specific things that
you need in your help option to explain something about DISCONTIGMEM.

Signed-off-by: Dave Hansen <haveblue@us.ibm.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>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index f7c96635d3b4fe7cf6d482b8d351e1c4f42095b4..c5739d6309dfc89d95feff14a411cb6ef9bb8955 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -509,7 +509,7 @@ config NR_CPUS
        depends on SMP
        default "64"
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool "Discontiguous Memory Support (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
@@ -518,6 +518,8 @@ config DISCONTIGMEM
          or have huge holes in the physical address space for other reasons.
          See <file:Documentation/vm/numa> for more.
 
+source "mm/Kconfig"
+
 config NUMA
        bool "NUMA Support (EXPERIMENTAL)"
        depends on DISCONTIGMEM

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ee8a9ad7bbd95343f46cd20e9467e062eaf848f2..07ba77c19f6c9172771c91f697ad0d2217439fdc 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -346,7 +346,7 @@ config PREEMPT
          Say Y here if you are building a kernel for a desktop, embedded
          or real-time system.  Say N if you are unsure.
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool
        default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
        help
@@ -355,6 +355,8 @@ config DISCONTIGMEM
          or have huge holes in the physical address space for other reasons.
          See <file:Documentation/vm/numa> for more.
 
+source "mm/Kconfig"
+
 config LEDS
        bool "Timer and CPU usage LEDs"
        depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \

diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 6caed90661fc8dcafbecdb6e15a92f95e142273d..dc0c1936969bc6ea673fac4691ddec209749b8d5 100644 (file)
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -179,6 +179,8 @@ config CMDLINE
          time by entering them here. As a minimum, you should specify the
          memory size and the root device (e.g., mem=64M root=/dev/nfs).
 
+source "mm/Kconfig"
+
 endmenu
 
 source "drivers/base/Kconfig"

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 4332ca348d5147f918eeab85cbb7a7340a303d14..f848e37614912a87064b9915260a125d6357babd 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -74,6 +74,8 @@ config PREEMPT
          Say Y here if you are building a kernel for a desktop, embedded
          or real-time system.  Say N if you are unsure.
 
+source mm/Kconfig
+
 endmenu
 
 menu "Hardware setup"

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 2b19372767eb8c084203852922825fde64662637..c93f95146cc28330f86ea3f658c82de4c3f77ac0 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -74,6 +74,8 @@ config HIGHPTE
          with a lot of RAM, this can be wasteful of precious low memory.
          Setting this option will put user-space page tables in high memory.
 
+source "mm/Kconfig"
+
 choice
        prompt "uClinux kernel load address"
        depends on !MMU

diff --git a/arch/h8300/Kconfig.cpu b/arch/h8300/Kconfig.cpu
index d9dd62a565a97242fca8699cfdca729e043d7a3c..a380167a13cf6f661fb294704c6b7d6d67f65988 100644 (file)
--- a/arch/h8300/Kconfig.cpu
+++ b/arch/h8300/Kconfig.cpu
@@ -180,4 +180,7 @@ config CPU_H8S
 config PREEMPT
        bool "Preemptible Kernel"
        default n
+
+source "mm/Kconfig"
+
 endmenu

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 35ca3a17ed209c81310ae74f1ae77b90d101493d..8e5242c8e09d77b3a41cb859d4ad6527c9d1a918 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -783,7 +783,7 @@ 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 DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool
        depends on NUMA
        default y
@@ -808,6 +808,8 @@ config HAVE_ARCH_ALLOC_REMAP
        depends on NUMA
        default y
 
+source "mm/Kconfig"
+
 config HIGHPTE
        bool "Allocate 3rd-level pagetables from highmem"
        depends on HIGHMEM4G || HIGHMEM64G

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ce4dfa8b834dfec30367effa7b315a8be514f4e5..9f6a46caba9b362bd1d1a21b221aace69d86c0d7 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -197,7 +197,7 @@ config HOLES_IN_ZONE
        bool
        default y if VIRTUAL_MEM_MAP
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool "Discontiguous memory support"
        depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP
        default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
@@ -300,6 +300,8 @@ config PREEMPT
           Say Y here if you are building a kernel for a desktop, embedded
           or real-time system.  Say N if you are unsure.
 
+source "mm/Kconfig"
+
 config HAVE_DEC_LOCK
        bool
        depends on (SMP || PREEMPT)

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 64c133344afef7e90d6aefbdf6856f18c0760e36..42ca8a39798dc6907cf80b21a3f18c0709301c43 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -172,11 +172,13 @@ config NOHIGHMEM
        bool
        default y
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool "Internal RAM Support"
        depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP
        default y
 
+source "mm/Kconfig"
+
 config IRAM_START
        hex "Internal memory start address (hex)"
        default "00f00000"

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index d0713c7d9f0ae28b309d426dfda81d2b87a34f9b..691a2469ff36e2130975848b53fc57f21665aa29 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -357,6 +357,8 @@ config 060_WRITETHROUGH
          is hardwired on.  The 53c710 SCSI driver is known to suffer from
          this problem.
 
+source "mm/Kconfig"
+
 endmenu
 
 menu "General setup"

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index e729bd280623d4f6ac7fe4790fcbcfd61cf4f709..dbfcdc8e60879617abdaf5bc5d74fa09e8724c3b 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -532,6 +532,8 @@ config ROMKERNEL
 
 endchoice
 
+source "mm/Kconfig"
+
 endmenu
 
 config ISA_DMA_API

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ab9944693f1f38c40852d7dafa45e75b040e907a..2710018ac80975dc7779e68e50db9cc7ca9a2a4d 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -492,7 +492,7 @@ config SGI_SN0_N_MODE
          which allows for more memory.  Your system is most probably
          running in M-Mode, so you should say N here.
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool
        default y if SGI_IP27
        help
@@ -501,6 +501,10 @@ config DISCONTIGMEM
          or have huge holes in the physical address space for other reasons.
          See <file:Documentation/vm/numa> for more.
 
+config ARCH_FLATMEM_DISABLE
+       def_bool y
+       depends on ARCH_DISCONTIGMEM_ENABLE
+
 config NUMA
        bool "NUMA Support"
        depends on SGI_IP27

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index e7e7c56fc212bd3a5099ca06b75c8f0867101db3..ab7cc4eb7fc138db029613d12489d3939c55a72a 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -148,7 +148,7 @@ config HOTPLUG_CPU
        default y if SMP
        select HOTPLUG
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool "Discontiguous memory support (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
@@ -157,6 +157,12 @@ config DISCONTIGMEM
          or have huge holes in the physical address space for other reasons.
          See <file:Documentation/vm/numa> for more.
 
+config ARCH_FLATMEM_DISABLE
+       def_bool y
+       depends on ARCH_DISCONTIGMEM_ENABLE
+
+source "mm/Kconfig"
+
 config PREEMPT
        bool
 #      bool "Preemptible Kernel"

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 10162b187bcf000a04897bc45cebefbe4d87c3b0..848f43970a4b4cd7123e0fa188e34ddd18ce20c3 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -905,6 +905,8 @@ config PREEMPT
 config HIGHMEM
        bool "High memory support"
 
+source "mm/Kconfig"
+
 source "fs/Kconfig.binfmt"
 
 config PROC_DEVICETREE

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 0f1fa289744eaf8446a3c5d563e89611b9bfab24..87344f324233a1ba473ef32cf3b7fe9602e17771 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -198,10 +198,12 @@ config HMT
          This option enables hardware multithreading on RS64 cpus.
          pSeries systems p620 and p660 have such a cpu type.
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool "Discontiguous Memory Support"
        depends on SMP && PPC_PSERIES
 
+source "mm/Kconfig"
+
 config NUMA
        bool "NUMA support"
        depends on DISCONTIGMEM

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ab79af84699ad0b94db2ff65feb2b9d095446be1..32696c1d92806c7cac9eebaa20220aacd6793993 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -226,6 +226,8 @@ config WARN_STACK_SIZE
          This allows you to specify the maximum frame size a function may
          have without the compiler complaining about it.
 
+source "mm/Kconfig"
+
 comment "I/O subsystem configuration"
 
 config MACHCHK_WARNING

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3468d5127223b7f5422b4b3e838e0d87b8ee3921..ac2b865359b2e990f985dbace896e41da2b1d534 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -486,7 +486,7 @@ config CPU_SUBTYPE_ST40
        depends on CPU_SUBTYPE_ST40STB1 || CPU_SUBTYPE_ST40GX1
        default y
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool
        depends on SH_HP690
        default y
@@ -496,6 +496,12 @@ config DISCONTIGMEM
          or have huge holes in the physical address space for other reasons.
          See <file:Documentation/vm/numa> for more.
 
+config ARCH_FLATMEM_DISABLE
+       def_bool y
+       depends on ARCH_DISCONTIGMEM_ENABLE
+
+source "mm/Kconfig"
+
 config ZERO_PAGE_OFFSET
        hex "Zero page offset"
        default "0x00001000" if !(SH_MPC1211 || SH_SH03)

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 76eb81fba45e5a8f301e1b5c214b4cc358c75ec5..708e59736a4db0fbbf40bb2f35c36ef8251e086b 100644 (file)
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -217,6 +217,8 @@ config PREEMPT
        bool "Preemptible Kernel (EXPERIMENTAL)"
        depends on EXPERIMENTAL
 
+source "mm/Kconfig"
+
 endmenu
 
 menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 237f922520fdc39dca44d8a8dc62a315a359a030..310d3f0c445e91ff153bd88c4b8741bb9c899173 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -291,6 +291,8 @@ config PRINTER
          If you have more than 8 printers, you need to increase the LP_NO
          macro in lp.c and the PARPORT_MAX macro in parport.h.
 
+source "mm/Kconfig"
+
 endmenu
 
 source "drivers/base/Kconfig"

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index a72fd15d5ea80a031f3c73a716d7ac6aec6a6f0a..e2b050eb3b96ec71362436a765892dbd0fb9a33b 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -484,6 +484,8 @@ config CMDLINE
 
          NOTE: This option WILL override the PROM bootargs setting!
 
+source "mm/Kconfig"
+
 endmenu
 
 source "drivers/base/Kconfig"

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index b8e952c88fd1280f704737c95ef3e387ca055f64..9469e77303e6c5a60982271d61c5c64580c763e9 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -74,6 +74,7 @@ config MODE_SKAS
        option will shrink the UML binary slightly.
 
 source "arch/um/Kconfig_arch"
+source "mm/Kconfig"
 
 config LD_SCRIPT_STATIC
        bool

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 90cd4baa75ee3a2cabea8a745c788dee2eb880b7..27febd6ffa80160043f485354f68e7e5b26ee51d 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -218,6 +218,8 @@ menu "Processor type and features"
             a lot of RAM, and you need to able to allocate very large
             contiguous chunks. If unsure, say N.
 
+source "mm/Kconfig"
+
 endmenu
 
 

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 289f448ac89cc426dcb5fdb4d23aaf8bef7988bb..9f5b99e7b1ebef090dba5d056ff589db9ac74038 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -265,7 +265,7 @@ config NUMA_EMU
          into virtual nodes when booted with "numa=fake=N", where N is the
          number of nodes. This is only useful for debugging.
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool
        depends on NUMA
        default y
@@ -274,6 +274,8 @@ config NUMA
        bool
        default n
 
+source "mm/Kconfig"
+
 config HAVE_DEC_LOCK
        bool
        depends on SMP