[PATCH] UBUNTU: Build in CPU Frequency scaling drivers

[Scott James Remnant]

Selecting the right CPU Frequency scaling driver is complicated from
userspace, involing a nasty shell script that attempts to guess by
grepping through /proc.

The kernel drivers themselves can adequately determine whether they
should be used, building them into the kernel will automatically select
the right one.

These aren't something you would want to unload either, you would
instead simply change the governor.

Signed-off-by: Scott James Remnant <scott at canonical.com>
---
 debian/config/amd64/config |   10 +++++-----
 debian/config/i386/config  |   26 +++++++++++++-------------
 debian/config/lpia/config  |   26 +++++++++++++-------------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 2019a10..1d1b55d 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -3593,7 +3593,7 @@ CONFIG_X86=y
 # CONFIG_X86_32 is not set
 CONFIG_X86_64=y
 CONFIG_X86_64_SMP=y
-CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -3618,17 +3618,17 @@ CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_P4_CLOCKMOD=y
 # CONFIG_X86_PAT is not set
 CONFIG_X86_PC=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_POWERNOW_K8=y
 CONFIG_X86_POWERNOW_K8_ACPI=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_X86_SMP=y
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=y
+CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 0af3ff4..426684d 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -3839,7 +3839,7 @@ CONFIG_X86=y
 CONFIG_X86_32=y
 CONFIG_X86_32_SMP=y
 # CONFIG_X86_64 is not set
-CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_X86_APM_BOOT=y
 CONFIG_X86_BIOS_REBOOT=y
@@ -3848,35 +3848,35 @@ CONFIG_X86_BSWAP=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_CPU=y
-CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_CPUFREQ_NFORCE2=y
 CONFIG_X86_CPUID=m
 # CONFIG_X86_ELAN is not set
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GENERICARCH is not set
-CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_GX_SUSPMOD=y
 CONFIG_X86_HT=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=y
+CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LPIA is not set
 # CONFIG_X86_MCE is not set
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_P4_CLOCKMOD=y
 # CONFIG_X86_PAT is not set
 CONFIG_X86_PC=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_X86_POPAD_OK=y
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K6=y
+CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_POWERNOW_K8=y
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_PPRO_FENCE=y
 # CONFIG_X86_PTDUMP is not set
@@ -3884,12 +3884,12 @@ CONFIG_X86_PPRO_FENCE=y
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_X86_SMP=y
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=y
 CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_SPEEDSTEP_ICH=y
+CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_TRAMPOLINE=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_X86_VOYAGER is not set
diff --git a/debian/config/lpia/config b/debian/config/lpia/config
index efc8374..793af70 100644
--- a/debian/config/lpia/config
+++ b/debian/config/lpia/config
@@ -3521,7 +3521,7 @@ CONFIG_X86=y
 CONFIG_X86_32=y
 CONFIG_X86_32_SMP=y
 # CONFIG_X86_64 is not set
-CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=y
 # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_BIOS_REBOOT=y
@@ -3529,7 +3529,7 @@ CONFIG_X86_BSWAP=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_CMPXCHG=y
 CONFIG_X86_CPU=y
-CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_CPUFREQ_NFORCE2=y
 CONFIG_X86_CPUID=m
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_E_POWERSAVER is not set
@@ -3537,29 +3537,29 @@ CONFIG_X86_F00F_BUG=y
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GENERICARCH is not set
-CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_GX_SUSPMOD=y
 CONFIG_X86_HT=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7
 CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=y
+CONFIG_X86_LONGRUN=y
 CONFIG_X86_LPIA=y
 # CONFIG_X86_MCE is not set
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MSR=m
-CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_P4_CLOCKMOD=y
 CONFIG_X86_PAT=y
 CONFIG_X86_PC=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_X86_POPAD_OK=y
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K6=y
+CONFIG_X86_POWERNOW_K7=y
 CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_POWERNOW_K8=y
 CONFIG_X86_POWERNOW_K8_ACPI=y
 CONFIG_X86_PPRO_FENCE=y
 # CONFIG_X86_PTDUMP is not set
@@ -3567,12 +3567,12 @@ CONFIG_X86_PPRO_FENCE=y
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_X86_RESERVE_LOW_64K=y
 CONFIG_X86_SMP=y
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=y
 CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_SPEEDSTEP_ICH=y
+CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 # CONFIG_X86_VOYAGER is not set
-- 
1.6.0.5