Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e19243e authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds
Browse files

[PATCH] update all defconfigs for ARCH_DISCONTIGMEM_ENABLE 



This will at least suppress one prompt that users would have received the
first time they compile with the new DISCONTIG arch option.  They'll still
get the "Memory Model" prompt, but 99% of them will have the default work
there.

Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3f22ab27

arch/alpha/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ CONFIG_ALPHA_CORE_AGP=y 
CONFIG_ALPHA_BROKEN_IRQ_MASK=y

CONFIG_EISA=y

# CONFIG_SMP is not set

# CONFIG_DISCONTIGMEM is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_VERBOSE_MCHECK=y

CONFIG_VERBOSE_MCHECK_ON=1

CONFIG_PCI_LEGACY_PROC=y

arch/ia64/configs/sn2_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ CONFIG_IA64_L1_CACHE_SHIFT=7 
CONFIG_NUMA=y

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_HOLES_IN_ZONE=y

CONFIG_DISCONTIGMEM=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

# CONFIG_IA64_CYCLONE is not set

CONFIG_IOSAPIC=y

CONFIG_IA64_SGI_SN_SIM=y

arch/ia64/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ CONFIG_IA64_L1_CACHE_SHIFT=7 
CONFIG_NUMA=y

CONFIG_VIRTUAL_MEM_MAP=y

CONFIG_HOLES_IN_ZONE=y

CONFIG_DISCONTIGMEM=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_IA64_CYCLONE=y

CONFIG_IOSAPIC=y

CONFIG_FORCE_MAX_ZONEORDER=18

arch/mips/configs/ip27_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ CONFIG_STOP_MACHINE=y 
# CONFIG_SGI_IP22 is not set

CONFIG_SGI_IP27=y

# CONFIG_SGI_SN0_N_MODE is not set

CONFIG_DISCONTIGMEM=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_NUMA=y

# CONFIG_MAPPED_KERNEL is not set

# CONFIG_REPLICATE_KTEXT is not set

arch/ppc64/configs/pSeries_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ CONFIG_IBMVIO=y 
CONFIG_IOMMU_VMERGE=y

CONFIG_SMP=y

CONFIG_NR_CPUS=128

CONFIG_DISCONTIGMEM=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_NUMA=y

CONFIG_SCHED_SMT=y

# CONFIG_PREEMPT is not set