x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message
authorLen Brown <len.brown@intel.com>
Fri, 15 Jul 2011 21:37:15 +0000 (17:37 -0400)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 15 Jul 2011 22:13:55 +0000 (15:13 -0700)
Fix the printk_once() so that it actually prints (didn't print before
due to a stray comma.)

[ hpa: changed to an incremental patch and adjusted the description
  accordingly. ]

Signed-off-by: Len Brown <len.brown@intel.com>
Link: http://lkml.kernel.org/r/alpine.LFD.2.02.1107151732480.18606@x980
Cc: <table@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/kernel/cpu/intel.c

index da0d779ecd9ecc3be2d8fb8d7284210a6e704456..ed6086eedf1d2aaafd5a767d2cb56f5ed51aead9 100644 (file)
@@ -465,11 +465,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
                u64 epb;
 
                rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
-               if ((epb & 0xF) == 0) {
-                       printk_once(KERN_WARNING, "x86: updated energy_perf_bias"
-                               " to 'normal' from 'performance'\n"
-                               "You can view and update epb via utility,"
-                               " such as x86_energy_perf_policy(8)\n");
+               if ((epb & 0xF) == ENERGY_PERF_BIAS_PERFORMANCE) {
+                       printk_once(KERN_WARNING "ENERGY_PERF_BIAS:"
+                               " Set to 'normal', was 'performance'\n"
+                               "ENERGY_PERF_BIAS: View and update with"
+                               " x86_energy_perf_policy(8)\n");
                        epb = (epb & ~0xF) | ENERGY_PERF_BIAS_NORMAL;
                        wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
                }