aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/alpha/Kconfig4
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm26/Kconfig2
-rw-r--r--arch/cris/Kconfig2
-rw-r--r--arch/frv/Kconfig2
-rw-r--r--arch/h8300/Kconfig.cpu3
-rw-r--r--arch/i386/Kconfig4
-rw-r--r--arch/ia64/Kconfig4
-rw-r--r--arch/m32r/Kconfig4
-rw-r--r--arch/m68k/Kconfig2
-rw-r--r--arch/m68knommu/Kconfig2
-rw-r--r--arch/mips/Kconfig6
-rw-r--r--arch/parisc/Kconfig8
-rw-r--r--arch/ppc/Kconfig2
-rw-r--r--arch/ppc64/Kconfig4
-rw-r--r--arch/s390/Kconfig2
-rw-r--r--arch/sh/Kconfig8
-rw-r--r--arch/sh64/Kconfig2
-rw-r--r--arch/sparc/Kconfig2
-rw-r--r--arch/sparc64/Kconfig2
-rw-r--r--arch/um/Kconfig1
-rw-r--r--arch/v850/Kconfig2
-rw-r--r--arch/x86_64/Kconfig4
23 files changed, 66 insertions, 10 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index f7c96635d3b4..c5739d6309df 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -509,7 +509,7 @@ config NR_CPUS
509 depends on SMP 509 depends on SMP
510 default "64" 510 default "64"
511 511
512config DISCONTIGMEM 512config ARCH_DISCONTIGMEM_ENABLE
513 bool "Discontiguous Memory Support (EXPERIMENTAL)" 513 bool "Discontiguous Memory Support (EXPERIMENTAL)"
514 depends on EXPERIMENTAL 514 depends on EXPERIMENTAL
515 help 515 help
@@ -518,6 +518,8 @@ config DISCONTIGMEM
518 or have huge holes in the physical address space for other reasons. 518 or have huge holes in the physical address space for other reasons.
519 See <file:Documentation/vm/numa> for more. 519 See <file:Documentation/vm/numa> for more.
520 520
521source "mm/Kconfig"
522
521config NUMA 523config NUMA
522 bool "NUMA Support (EXPERIMENTAL)" 524 bool "NUMA Support (EXPERIMENTAL)"
523 depends on DISCONTIGMEM 525 depends on DISCONTIGMEM
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ee8a9ad7bbd9..07ba77c19f6c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -346,7 +346,7 @@ config PREEMPT
346 Say Y here if you are building a kernel for a desktop, embedded 346 Say Y here if you are building a kernel for a desktop, embedded
347 or real-time system. Say N if you are unsure. 347 or real-time system. Say N if you are unsure.
348 348
349config DISCONTIGMEM 349config ARCH_DISCONTIGMEM_ENABLE
350 bool 350 bool
351 default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) 351 default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
352 help 352 help
@@ -355,6 +355,8 @@ config DISCONTIGMEM
355 or have huge holes in the physical address space for other reasons. 355 or have huge holes in the physical address space for other reasons.
356 See <file:Documentation/vm/numa> for more. 356 See <file:Documentation/vm/numa> for more.
357 357
358source "mm/Kconfig"
359
358config LEDS 360config LEDS
359 bool "Timer and CPU usage LEDs" 361 bool "Timer and CPU usage LEDs"
360 depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \ 362 depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 6caed90661fc..dc0c1936969b 100644
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -179,6 +179,8 @@ config CMDLINE
179 time by entering them here. As a minimum, you should specify the 179 time by entering them here. As a minimum, you should specify the
180 memory size and the root device (e.g., mem=64M root=/dev/nfs). 180 memory size and the root device (e.g., mem=64M root=/dev/nfs).
181 181
182source "mm/Kconfig"
183
182endmenu 184endmenu
183 185
184source "drivers/base/Kconfig" 186source "drivers/base/Kconfig"
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 4332ca348d51..f848e3761491 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -74,6 +74,8 @@ config PREEMPT
74 Say Y here if you are building a kernel for a desktop, embedded 74 Say Y here if you are building a kernel for a desktop, embedded
75 or real-time system. Say N if you are unsure. 75 or real-time system. Say N if you are unsure.
76 76
77source mm/Kconfig
78
77endmenu 79endmenu
78 80
79menu "Hardware setup" 81menu "Hardware setup"
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 2b19372767eb..c93f95146cc2 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -74,6 +74,8 @@ config HIGHPTE
74 with a lot of RAM, this can be wasteful of precious low memory. 74 with a lot of RAM, this can be wasteful of precious low memory.
75 Setting this option will put user-space page tables in high memory. 75 Setting this option will put user-space page tables in high memory.
76 76
77source "mm/Kconfig"
78
77choice 79choice
78 prompt "uClinux kernel load address" 80 prompt "uClinux kernel load address"
79 depends on !MMU 81 depends on !MMU
diff --git a/arch/h8300/Kconfig.cpu b/arch/h8300/Kconfig.cpu
index d9dd62a565a9..a380167a13cf 100644
--- a/arch/h8300/Kconfig.cpu
+++ b/arch/h8300/Kconfig.cpu
@@ -180,4 +180,7 @@ config CPU_H8S
180config PREEMPT 180config PREEMPT
181 bool "Preemptible Kernel" 181 bool "Preemptible Kernel"
182 default n 182 default n
183
184source "mm/Kconfig"
185
183endmenu 186endmenu
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 35ca3a17ed20..8e5242c8e09d 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -783,7 +783,7 @@ comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
783comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI" 783comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
784 depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI) 784 depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
785 785
786config DISCONTIGMEM 786config ARCH_DISCONTIGMEM_ENABLE
787 bool 787 bool
788 depends on NUMA 788 depends on NUMA
789 default y 789 default y
@@ -808,6 +808,8 @@ config HAVE_ARCH_ALLOC_REMAP
808 depends on NUMA 808 depends on NUMA
809 default y 809 default y
810 810
811source "mm/Kconfig"
812
811config HIGHPTE 813config HIGHPTE
812 bool "Allocate 3rd-level pagetables from highmem" 814 bool "Allocate 3rd-level pagetables from highmem"
813 depends on HIGHMEM4G || HIGHMEM64G 815 depends on HIGHMEM4G || HIGHMEM64G
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ce4dfa8b834d..9f6a46caba9b 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -197,7 +197,7 @@ config HOLES_IN_ZONE
197 bool 197 bool
198 default y if VIRTUAL_MEM_MAP 198 default y if VIRTUAL_MEM_MAP
199 199
200config DISCONTIGMEM 200config ARCH_DISCONTIGMEM_ENABLE
201 bool "Discontiguous memory support" 201 bool "Discontiguous memory support"
202 depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP 202 depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) && NUMA && VIRTUAL_MEM_MAP
203 default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA 203 default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA
@@ -300,6 +300,8 @@ config PREEMPT
300 Say Y here if you are building a kernel for a desktop, embedded 300 Say Y here if you are building a kernel for a desktop, embedded
301 or real-time system. Say N if you are unsure. 301 or real-time system. Say N if you are unsure.
302 302
303source "mm/Kconfig"
304
303config HAVE_DEC_LOCK 305config HAVE_DEC_LOCK
304 bool 306 bool
305 depends on (SMP || PREEMPT) 307 depends on (SMP || PREEMPT)
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 64c133344afe..42ca8a39798d 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -172,11 +172,13 @@ config NOHIGHMEM
172 bool 172 bool
173 default y 173 default y
174 174
175config DISCONTIGMEM 175config ARCH_DISCONTIGMEM_ENABLE
176 bool "Internal RAM Support" 176 bool "Internal RAM Support"
177 depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP 177 depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP
178 default y 178 default y
179 179
180source "mm/Kconfig"
181
180config IRAM_START 182config IRAM_START
181 hex "Internal memory start address (hex)" 183 hex "Internal memory start address (hex)"
182 default "00f00000" 184 default "00f00000"
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index d0713c7d9f0a..691a2469ff36 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -357,6 +357,8 @@ config 060_WRITETHROUGH
357 is hardwired on. The 53c710 SCSI driver is known to suffer from 357 is hardwired on. The 53c710 SCSI driver is known to suffer from
358 this problem. 358 this problem.
359 359
360source "mm/Kconfig"
361
360endmenu 362endmenu
361 363
362menu "General setup" 364menu "General setup"
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index e729bd280623..dbfcdc8e6087 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -532,6 +532,8 @@ config ROMKERNEL
532 532
533endchoice 533endchoice
534 534
535source "mm/Kconfig"
536
535endmenu 537endmenu
536 538
537config ISA_DMA_API 539config ISA_DMA_API
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ab9944693f1f..2710018ac809 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -492,7 +492,7 @@ config SGI_SN0_N_MODE
492 which allows for more memory. Your system is most probably 492 which allows for more memory. Your system is most probably
493 running in M-Mode, so you should say N here. 493 running in M-Mode, so you should say N here.
494 494
495config DISCONTIGMEM 495config ARCH_DISCONTIGMEM_ENABLE
496 bool 496 bool
497 default y if SGI_IP27 497 default y if SGI_IP27
498 help 498 help
@@ -501,6 +501,10 @@ config DISCONTIGMEM
501 or have huge holes in the physical address space for other reasons. 501 or have huge holes in the physical address space for other reasons.
502 See <file:Documentation/vm/numa> for more. 502 See <file:Documentation/vm/numa> for more.
503 503
504config ARCH_FLATMEM_DISABLE
505 def_bool y
506 depends on ARCH_DISCONTIGMEM_ENABLE
507
504config NUMA 508config NUMA
505 bool "NUMA Support" 509 bool "NUMA Support"
506 depends on SGI_IP27 510 depends on SGI_IP27
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index e7e7c56fc212..ab7cc4eb7fc1 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -148,7 +148,7 @@ config HOTPLUG_CPU
148 default y if SMP 148 default y if SMP
149 select HOTPLUG 149 select HOTPLUG
150 150
151config DISCONTIGMEM 151config ARCH_DISCONTIGMEM_ENABLE
152 bool "Discontiguous memory support (EXPERIMENTAL)" 152 bool "Discontiguous memory support (EXPERIMENTAL)"
153 depends on EXPERIMENTAL 153 depends on EXPERIMENTAL
154 help 154 help
@@ -157,6 +157,12 @@ config DISCONTIGMEM
157 or have huge holes in the physical address space for other reasons. 157 or have huge holes in the physical address space for other reasons.
158 See <file:Documentation/vm/numa> for more. 158 See <file:Documentation/vm/numa> for more.
159 159
160config ARCH_FLATMEM_DISABLE
161 def_bool y
162 depends on ARCH_DISCONTIGMEM_ENABLE
163
164source "mm/Kconfig"
165
160config PREEMPT 166config PREEMPT
161 bool 167 bool
162# bool "Preemptible Kernel" 168# bool "Preemptible Kernel"
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 10162b187bcf..848f43970a4b 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -905,6 +905,8 @@ config PREEMPT
905config HIGHMEM 905config HIGHMEM
906 bool "High memory support" 906 bool "High memory support"
907 907
908source "mm/Kconfig"
909
908source "fs/Kconfig.binfmt" 910source "fs/Kconfig.binfmt"
909 911
910config PROC_DEVICETREE 912config PROC_DEVICETREE
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 0f1fa289744e..87344f324233 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -198,10 +198,12 @@ config HMT
198 This option enables hardware multithreading on RS64 cpus. 198 This option enables hardware multithreading on RS64 cpus.
199 pSeries systems p620 and p660 have such a cpu type. 199 pSeries systems p620 and p660 have such a cpu type.
200 200
201config DISCONTIGMEM 201config ARCH_DISCONTIGMEM_ENABLE
202 bool "Discontiguous Memory Support" 202 bool "Discontiguous Memory Support"
203 depends on SMP && PPC_PSERIES 203 depends on SMP && PPC_PSERIES
204 204
205source "mm/Kconfig"
206
205config NUMA 207config NUMA
206 bool "NUMA support" 208 bool "NUMA support"
207 depends on DISCONTIGMEM 209 depends on DISCONTIGMEM
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ab79af84699a..32696c1d9280 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -226,6 +226,8 @@ config WARN_STACK_SIZE
226 This allows you to specify the maximum frame size a function may 226 This allows you to specify the maximum frame size a function may
227 have without the compiler complaining about it. 227 have without the compiler complaining about it.
228 228
229source "mm/Kconfig"
230
229comment "I/O subsystem configuration" 231comment "I/O subsystem configuration"
230 232
231config MACHCHK_WARNING 233config MACHCHK_WARNING
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 3468d5127223..ac2b865359b2 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -486,7 +486,7 @@ config CPU_SUBTYPE_ST40
486 depends on CPU_SUBTYPE_ST40STB1 || CPU_SUBTYPE_ST40GX1 486 depends on CPU_SUBTYPE_ST40STB1 || CPU_SUBTYPE_ST40GX1
487 default y 487 default y
488 488
489config DISCONTIGMEM 489config ARCH_DISCONTIGMEM_ENABLE
490 bool 490 bool
491 depends on SH_HP690 491 depends on SH_HP690
492 default y 492 default y
@@ -496,6 +496,12 @@ config DISCONTIGMEM
496 or have huge holes in the physical address space for other reasons. 496 or have huge holes in the physical address space for other reasons.
497 See <file:Documentation/vm/numa> for more. 497 See <file:Documentation/vm/numa> for more.
498 498
499config ARCH_FLATMEM_DISABLE
500 def_bool y
501 depends on ARCH_DISCONTIGMEM_ENABLE
502
503source "mm/Kconfig"
504
499config ZERO_PAGE_OFFSET 505config ZERO_PAGE_OFFSET
500 hex "Zero page offset" 506 hex "Zero page offset"
501 default "0x00001000" if !(SH_MPC1211 || SH_SH03) 507 default "0x00001000" if !(SH_MPC1211 || SH_SH03)
diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 76eb81fba45e..708e59736a4d 100644
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -217,6 +217,8 @@ config PREEMPT
217 bool "Preemptible Kernel (EXPERIMENTAL)" 217 bool "Preemptible Kernel (EXPERIMENTAL)"
218 depends on EXPERIMENTAL 218 depends on EXPERIMENTAL
219 219
220source "mm/Kconfig"
221
220endmenu 222endmenu
221 223
222menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" 224menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 237f922520fd..310d3f0c445e 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -291,6 +291,8 @@ config PRINTER
291 If you have more than 8 printers, you need to increase the LP_NO 291 If you have more than 8 printers, you need to increase the LP_NO
292 macro in lp.c and the PARPORT_MAX macro in parport.h. 292 macro in lp.c and the PARPORT_MAX macro in parport.h.
293 293
294source "mm/Kconfig"
295
294endmenu 296endmenu
295 297
296source "drivers/base/Kconfig" 298source "drivers/base/Kconfig"
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index a72fd15d5ea8..e2b050eb3b96 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -484,6 +484,8 @@ config CMDLINE
484 484
485 NOTE: This option WILL override the PROM bootargs setting! 485 NOTE: This option WILL override the PROM bootargs setting!
486 486
487source "mm/Kconfig"
488
487endmenu 489endmenu
488 490
489source "drivers/base/Kconfig" 491source "drivers/base/Kconfig"
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index b8e952c88fd1..9469e77303e6 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -74,6 +74,7 @@ config MODE_SKAS
74 option will shrink the UML binary slightly. 74 option will shrink the UML binary slightly.
75 75
76source "arch/um/Kconfig_arch" 76source "arch/um/Kconfig_arch"
77source "mm/Kconfig"
77 78
78config LD_SCRIPT_STATIC 79config LD_SCRIPT_STATIC
79 bool 80 bool
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 90cd4baa75ee..27febd6ffa80 100644
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -218,6 +218,8 @@ menu "Processor type and features"
218 a lot of RAM, and you need to able to allocate very large 218 a lot of RAM, and you need to able to allocate very large
219 contiguous chunks. If unsure, say N. 219 contiguous chunks. If unsure, say N.
220 220
221source "mm/Kconfig"
222
221endmenu 223endmenu
222 224
223 225
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 289f448ac89c..9f5b99e7b1eb 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -265,7 +265,7 @@ config NUMA_EMU
265 into virtual nodes when booted with "numa=fake=N", where N is the 265 into virtual nodes when booted with "numa=fake=N", where N is the
266 number of nodes. This is only useful for debugging. 266 number of nodes. This is only useful for debugging.
267 267
268config DISCONTIGMEM 268config ARCH_DISCONTIGMEM_ENABLE
269 bool 269 bool
270 depends on NUMA 270 depends on NUMA
271 default y 271 default y
@@ -274,6 +274,8 @@ config NUMA
274 bool 274 bool
275 default n 275 default n
276 276
277source "mm/Kconfig"
278
277config HAVE_DEC_LOCK 279config HAVE_DEC_LOCK
278 bool 280 bool
279 depends on SMP 281 depends on SMP