Merge branch 'fixes-25' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

* 'fixes-25' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] fix section mismatch warnings
  [CPUFREQ] Remove debugging message from e_powersaver
  [CPUFREQ] Fix missing cpufreq_cpu_put() call in ->store
  [CPUFREQ] Fix missing cpufreq_cpu_put() call in ->show

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/x86/kernel/cpu/cpufreq/e_powersaver.c b/arch/x86/kernel/cpu/cpufreq/e_powersaver.c
index 39f8cb18296c..c2f930d86640 100644
--- a/arch/x86/kernel/cpu/cpufreq/e_powersaver.c
+++ b/arch/x86/kernel/cpu/cpufreq/e_powersaver.c
@@ -55,7 +55,6 @@ static int eps_set_state(struct eps_cpu_data *centaur,
 {
         struct cpufreq_freqs freqs;
         u32 lo, hi;
-        u8 current_multiplier, current_voltage;
         int err = 0;
         int i;
 
@@ -95,6 +94,10 @@ postchange:
         rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
         freqs.new = centaur->fsb * ((lo >> 8) & 0xff);
 
+#ifdef DEBUG
+        {
+        u8 current_multiplier, current_voltage;
+
         /* Print voltage and multiplier */
         rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
         current_voltage = lo & 0xff;
@@ -103,7 +106,8 @@ postchange:
         current_multiplier = (lo >> 8) & 0xff;
         printk(KERN_INFO "eps: Current multiplier = %d\n",
                 current_multiplier);
-
+        }
+#endif
         cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
         return err;
 }