Centralise CPU_FREQ options into config-generic.

Switch to using ondemand by default. (rhbz 713572)

7 files changed, 23 insertions, 70 deletions

diff --git a/config-generic b/config-generic
index 28d710cd5..ae0bd8226 100644
--- a/config-generic
+++ b/config-generic
@@ -4015,6 +4015,18 @@ CONFIG_PM_TRACE=y
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_RUNTIME=y
 
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+
 ## BEGIN ISA Junk.
 
 CONFIG_I82365=m
diff --git a/config-ia64-generic b/config-ia64-generic
index 704c704aa..f469b9621 100644
--- a/config-ia64-generic
+++ b/config-ia64-generic
@@ -155,17 +155,6 @@ CONFIG_SCHED_SMT=y
 
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEBUG=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-
 CONFIG_IA64_ACPI_CPUFREQ=m
 
 # CONFIG_PERMIT_BSP_REMOVE is not set
diff --git a/config-powerpc-generic b/config-powerpc-generic
index e47c31588..8dd44f399 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -13,19 +13,6 @@ CONFIG_TAU_AVERAGE=y
 
 CONFIG_SECCOMP=y
 
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEBUG=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-
 CONFIG_PM=y
 
 CONFIG_PM_STD_PARTITION=""
diff --git a/config-sparc64-generic b/config-sparc64-generic
index dac8a644f..8cc28f74a 100644
--- a/config-sparc64-generic
+++ b/config-sparc64-generic
@@ -8,18 +8,7 @@ CONFIG_HZ=100
 
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-CONFIG_CPU_FREQ_DEBUG=y
-# CONFIG_CPU_FREQ_STAT is not set
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
 CONFIG_US3_FREQ=m
 CONFIG_US2E_FREQ=m
 
diff --git a/config-x86-generic b/config-x86-generic
index 437eed906..a5cf0f07c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -158,34 +158,18 @@ CONFIG_ACPI_APEI_GHES=m
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_CUSTOM_METHOD=m
 
-#
-# CPUFreq processor drivers
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEBUG=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_PCC_CPUFREQ=y
 # CONFIG_X86_POWERNOW_K6 is not set
 CONFIG_X86_POWERNOW_K7=y
-CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_POWERNOW_K8=y
 # CONFIG_X86_GX_SUSPMOD is not set
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 CONFIG_X86_SPEEDSTEP_LIB=y
 # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set
-CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_P4_CLOCKMOD=y
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
diff --git a/config-x86_64-generic b/config-x86_64-generic
index a633484ed..7700e4e9d 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -56,21 +56,9 @@ CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_DEBUG=y
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_PCC_CPUFREQ=m 
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ=y
 
 CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
diff --git a/kernel.spec b/kernel.spec
index 943db3f03..99d6407f9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1878,6 +1878,10 @@ fi
 # and build.
 
 %changelog
+* Thu Jul 07 2011 Dave Jones <davej@redhat.com>
+- Centralise CPU_FREQ options into config-generic.
+  Switch to using ondemand by default. (rhbz 713572)
+
 * Wed Jul 06 2011 Chuck Ebbert <cebbert@redhat.com>
 - Set CONFIG_X86_RESERVE_LOW=640 as requested by mjg