tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Dave Hansen and committed by
Linus Torvalds 0e19243e 3f22ab27

+6 -6
+1 -1
arch/alpha/defconfig
··· 96 96 CONFIG_ALPHA_BROKEN_IRQ_MASK=y 97 97 CONFIG_EISA=y 98 98 # CONFIG_SMP is not set 99 - # CONFIG_DISCONTIGMEM is not set 99 + # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 100 100 CONFIG_VERBOSE_MCHECK=y 101 101 CONFIG_VERBOSE_MCHECK_ON=1 102 102 CONFIG_PCI_LEGACY_PROC=y
+1 -1
arch/ia64/configs/sn2_defconfig
··· 78 78 CONFIG_NUMA=y 79 79 CONFIG_VIRTUAL_MEM_MAP=y 80 80 CONFIG_HOLES_IN_ZONE=y 81 - CONFIG_DISCONTIGMEM=y 81 + CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 82 82 # CONFIG_IA64_CYCLONE is not set 83 83 CONFIG_IOSAPIC=y 84 84 CONFIG_IA64_SGI_SN_SIM=y
+1 -1
arch/ia64/defconfig
··· 84 84 CONFIG_NUMA=y 85 85 CONFIG_VIRTUAL_MEM_MAP=y 86 86 CONFIG_HOLES_IN_ZONE=y 87 - CONFIG_DISCONTIGMEM=y 87 + CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 88 88 CONFIG_IA64_CYCLONE=y 89 89 CONFIG_IOSAPIC=y 90 90 CONFIG_FORCE_MAX_ZONEORDER=18
+1 -1
arch/mips/configs/ip27_defconfig
··· 82 82 # CONFIG_SGI_IP22 is not set 83 83 CONFIG_SGI_IP27=y 84 84 # CONFIG_SGI_SN0_N_MODE is not set 85 - CONFIG_DISCONTIGMEM=y 85 + CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 86 86 CONFIG_NUMA=y 87 87 # CONFIG_MAPPED_KERNEL is not set 88 88 # CONFIG_REPLICATE_KTEXT is not set
+1 -1
arch/ppc64/configs/pSeries_defconfig
··· 88 88 CONFIG_IOMMU_VMERGE=y 89 89 CONFIG_SMP=y 90 90 CONFIG_NR_CPUS=128 91 - CONFIG_DISCONTIGMEM=y 91 + CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 92 92 CONFIG_NUMA=y 93 93 CONFIG_SCHED_SMT=y 94 94 # CONFIG_PREEMPT is not set
+1 -1
arch/ppc64/defconfig
··· 89 89 CONFIG_IOMMU_VMERGE=y 90 90 CONFIG_SMP=y 91 91 CONFIG_NR_CPUS=32 92 - CONFIG_DISCONTIGMEM=y 92 + CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 93 93 # CONFIG_NUMA is not set 94 94 # CONFIG_SCHED_SMT is not set 95 95 # CONFIG_PREEMPT is not set