mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
[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>
This commit is contained in:
parent
3a9da7655d
commit
3f22ab276b
|
@ -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
|
||||
|
|
|
@ -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 || \
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -180,4 +180,7 @@ config CPU_H8S
|
|||
config PREEMPT
|
||||
bool "Preemptible Kernel"
|
||||
default n
|
||||
|
||||
source "mm/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -532,6 +532,8 @@ config ROMKERNEL
|
|||
|
||||
endchoice
|
||||
|
||||
source "mm/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
config ISA_DMA_API
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -905,6 +905,8 @@ config PREEMPT
|
|||
config HIGHMEM
|
||||
bool "High memory support"
|
||||
|
||||
source "mm/Kconfig"
|
||||
|
||||
source "fs/Kconfig.binfmt"
|
||||
|
||||
config PROC_DEVICETREE
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -484,6 +484,8 @@ config CMDLINE
|
|||
|
||||
NOTE: This option WILL override the PROM bootargs setting!
|
||||
|
||||
source "mm/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
source "drivers/base/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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue