[-mm patch] CPU_FREQ_GOV_PERFORMANCE must always be y

[Adrian Bunk <bunk@stusta.de>]

On Thu, Aug 02, 2007 at 02:28:06AM +0200, Gabriel C wrote:
> Andrew Morton wrote:
> > On Wed, 1 Aug 2007 16:31:46 -0700
> > "Miles Lane" <miles.lane@gmail.com> wrote:
> > 
> >>   LD      .tmp_vmlinux1
> >> drivers/built-in.o: In function `__cpufreq_governor':
> >> cpufreq.c:(.text+0xaf178): undefined reference to `cpufreq_gov_performance'
> >> cpufreq.c:(.text+0xaf18a): undefined reference to `cpufreq_gov_performance'
> >> make: *** [.tmp_vmlinux1] Error 1
> > 
> > One for Thomas, I expect.
> 
> Is this patch :
> 
> cpufreq-allow-ondemand-and-conservative-cpufreq-governors-to-be-used-as-default.patch
> 
> Reverting it here fixes the error.

Possible fix below.

> Gabriel

cu
Adrian


<--  snip  -->


With the 'performance' governor always as a fallback it must always be 
compiled into the kernel.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/cpufreq/Kconfig |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

d7418849ec236338ec5ac74c0d66e5aaae466ffe 
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 721f86f..91f7cfd 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -84,7 +84,6 @@ config CPU_FREQ_DEFAULT_GOV_USERSPACE
 config CPU_FREQ_DEFAULT_GOV_ONDEMAND
 	bool "ondemand"
 	select CPU_FREQ_GOV_ONDEMAND
-	select CPU_FREQ_GOV_PERFORMANCE
 	help
 	  Use the CPUFreq governor 'ondemand' as default. This allows
 	  you to get a full dynamic frequency capable system by simply
@@ -96,7 +95,6 @@ config CPU_FREQ_DEFAULT_GOV_ONDEMAND
 config CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
 	bool "conservative"
 	select CPU_FREQ_GOV_CONSERVATIVE
-	select CPU_FREQ_GOV_PERFORMANCE
 	help
 	  Use the CPUFreq governor 'conservative' as default. This allows
 	  you to get a full dynamic frequency capable system by simply
@@ -107,7 +105,8 @@ config CPU_FREQ_DEFAULT_GOV_CONSERVATIVE
 endchoice
 
 config CPU_FREQ_GOV_PERFORMANCE
-	tristate "'performance' governor"
+	tristate
+	default y
 	help
 	  This cpufreq governor sets the frequency statically to the
 	  highest available CPU frequency.