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 <[EMAIL PROTECTED]>
---
arch/x86_64/defconfig | 0
memhotplug-dave/arch/alpha/defconfig | 2 +-
memhotplug-dave/arch/ia64/configs/sn2_defconfig | 2 +-
memhotplug-dave/arch/ia64/defconfig | 2 +-
memhotplug-dave/arch/mips/configs/ip27_defconfig | 2 +-
memhotplug-dave/arch/ppc64/configs/pSeries_defconfig | 2 +-
memhotplug-dave/arch/ppc64/defconfig | 2 +-
7 files changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/alpha/defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/alpha/defconfig
---
memhotplug/arch/alpha/defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
2005-04-04 10:15:34.000000000 -0700
+++ memhotplug-dave/arch/alpha/defconfig 2005-04-04 10:15:35.000000000
-0700
@@ -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
diff -L arch/arm/configs/a5k_defconfig -puN /dev/null /dev/null
diff -puN
arch/arm/configs/assabet_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/assabet_defconfig
diff -puN
arch/arm/configs/badge4_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/badge4_defconfig
diff -puN
arch/arm/configs/cerfcube_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/cerfcube_defconfig
diff -puN
arch/arm/configs/clps7500_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/clps7500_defconfig
diff -puN
arch/arm/configs/edb7211_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/edb7211_defconfig
diff -puN
arch/arm/configs/footbridge_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/footbridge_defconfig
diff -puN
arch/arm/configs/fortunet_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/fortunet_defconfig
diff -puN
arch/arm/configs/h3600_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/h3600_defconfig
diff -puN
arch/arm/configs/hackkit_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/hackkit_defconfig
diff -puN
arch/arm/configs/jornada720_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/jornada720_defconfig
diff -puN
arch/arm/configs/lart_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/lart_defconfig
diff -puN
arch/arm/configs/lpd7a400_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/lpd7a400_defconfig
diff -puN
arch/arm/configs/lpd7a404_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/lpd7a404_defconfig
diff -puN
arch/arm/configs/lusl7200_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/lusl7200_defconfig
diff -puN
arch/arm/configs/neponset_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/neponset_defconfig
diff -puN
arch/arm/configs/omnimeter_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/omnimeter_defconfig
diff -puN
arch/arm/configs/pleb_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/pleb_defconfig
diff -puN
arch/arm/configs/shannon_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/shannon_defconfig
diff -puN
arch/arm/configs/simpad_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/arm/configs/simpad_defconfig
diff -puN
arch/ia64/configs/sn2_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/ia64/configs/sn2_defconfig
---
memhotplug/arch/ia64/configs/sn2_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
2005-04-04 10:15:34.000000000 -0700
+++ memhotplug-dave/arch/ia64/configs/sn2_defconfig 2005-04-04
10:15:35.000000000 -0700
@@ -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
diff -puN arch/ia64/defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/ia64/defconfig
---
memhotplug/arch/ia64/defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
2005-04-04 10:15:34.000000000 -0700
+++ memhotplug-dave/arch/ia64/defconfig 2005-04-04 10:15:35.000000000 -0700
@@ -77,7 +77,7 @@ CONFIG_IA64_PAGE_SIZE_16KB=y
CONFIG_IA64_L1_CACHE_SHIFT=7
CONFIG_NUMA=y
CONFIG_VIRTUAL_MEM_MAP=y
-CONFIG_DISCONTIGMEM=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
CONFIG_IA64_CYCLONE=y
CONFIG_IOSAPIC=y
CONFIG_FORCE_MAX_ZONEORDER=18
diff -puN arch/m32r/defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/defconfig
diff -puN
arch/m32r/m32700ut/defconfig.m32700ut.smp~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/m32700ut/defconfig.m32700ut.smp
diff -puN
arch/m32r/m32700ut/defconfig.m32700ut.up~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/m32700ut/defconfig.m32700ut.up
diff -puN
arch/m32r/mappi/defconfig.nommu~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/mappi/defconfig.nommu
diff -puN
arch/m32r/mappi/defconfig.smp~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/mappi/defconfig.smp
diff -puN
arch/m32r/mappi/defconfig.up~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/mappi/defconfig.up
diff -puN
arch/m32r/mappi2/defconfig.vdec2~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/mappi2/defconfig.vdec2
diff -puN
arch/m32r/oaks32r/defconfig.nommu~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/oaks32r/defconfig.nommu
diff -puN
arch/m32r/opsput/defconfig.opsput~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/m32r/opsput/defconfig.opsput
diff -puN
arch/mips/configs/ip27_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/mips/configs/ip27_defconfig
---
memhotplug/arch/mips/configs/ip27_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
2005-04-04 10:15:34.000000000 -0700
+++ memhotplug-dave/arch/mips/configs/ip27_defconfig 2005-04-04
10:15:35.000000000 -0700
@@ -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
diff -puN
arch/parisc/configs/712_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/parisc/configs/712_defconfig
diff -puN
arch/parisc/configs/a500_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/parisc/configs/a500_defconfig
diff -puN
arch/parisc/configs/c3000_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/parisc/configs/c3000_defconfig
diff -puN
arch/ppc64/configs/pSeries_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/ppc64/configs/pSeries_defconfig
---
memhotplug/arch/ppc64/configs/pSeries_defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
2005-04-04 10:15:35.000000000 -0700
+++ memhotplug-dave/arch/ppc64/configs/pSeries_defconfig 2005-04-04
10:15:35.000000000 -0700
@@ -82,7 +82,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
diff -puN arch/ppc64/defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/ppc64/defconfig
---
memhotplug/arch/ppc64/defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
2005-04-04 10:15:35.000000000 -0700
+++ memhotplug-dave/arch/ppc64/defconfig 2005-04-04 10:15:35.000000000
-0700
@@ -84,7 +84,7 @@ CONFIG_BOOTX_TEXT=y
CONFIG_IOMMU_VMERGE=y
CONFIG_SMP=y
CONFIG_NR_CPUS=32
-CONFIG_DISCONTIGMEM=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
# CONFIG_NUMA is not set
# CONFIG_SCHED_SMT is not set
# CONFIG_PREEMPT is not set
diff -puN arch/x86_64/defconfig~A8-update-all-defconfigs-for-ARCH...DISCONTIG
arch/x86_64/defconfig
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
