From 9d4a7ca266dcb142f80750286e3b09ebecd02079 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 21 Feb 2013 05:09:00 +0000 Subject: [PATCH] Explicitly set defaults for several config variables svn path=/dists/trunk/linux/; revision=19836 --- debian/config/config | 1 + debian/config/i386/config.686-pae | 3 +++ debian/config/kernelarch-x86/config | 3 +++ 3 files changed, 7 insertions(+) diff --git a/debian/config/config b/debian/config/config index 1009e872b..9d68d8c7e 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4203,6 +4203,7 @@ CONFIG_BOOT_PRINTK_DELAY=y ## CONFIG_MEMORY_HOTPLUG=y CONFIG_MEMORY_HOTREMOVE=y +CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y CONFIG_KSM=y diff --git a/debian/config/i386/config.686-pae b/debian/config/i386/config.686-pae index 8c3629c70..3e4288058 100644 --- a/debian/config/i386/config.686-pae +++ b/debian/config/i386/config.686-pae @@ -10,6 +10,9 @@ CONFIG_HIGHMEM64G=y CONFIG_X86_PAE=y # CONFIG_MATH_EMULATION is not set # CONFIG_EISA is not set +# CONFIG_ALIX is not set +# CONFIG_NET5501 is not set +# CONFIG_GEOS is not set ## ## file: arch/x86/Kconfig.cpu diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index b73504c71..6ef2d333b 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -52,6 +52,8 @@ CONFIG_CRASH_DUMP=y # CONFIG_KEXEC_JUMP is not set CONFIG_RELOCATABLE=y CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set CONFIG_PCI=y @@ -355,6 +357,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y ## CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_POWERNOW_K8=m CONFIG_X86_SPEEDSTEP_CENTRINO=m CONFIG_X86_P4_CLOCKMOD=m