lkml.org 
[lkml]   [2011]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [tip:x86/cpu] x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message
From
Date
On Sat, 2011-07-16 at 18:52 +0000, tip-bot for Len Brown wrote:
> Commit-ID: 17edf2d79f1ea6dfdb4c444801d928953b9f98d6
> Gitweb: http://git.kernel.org/tip/17edf2d79f1ea6dfdb4c444801d928953b9f98d6
> Author: Len Brown <len.brown@intel.com>
> AuthorDate: Fri, 15 Jul 2011 17:37:15 -0400
> Committer: H. Peter Anvin <hpa@linux.intel.com>
> CommitDate: Fri, 15 Jul 2011 15:13:55 -0700
>
> x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message
>
> 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>

This "table" should be stable :)

Cc: <stable@kernel.org>
Reviewed-by: Christoph Fritz <chf.fritz@googlemail.com>

Thanks,
Christoph

> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
> ---
> arch/x86/kernel/cpu/intel.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
> index da0d779..ed6086e 100644
> --- a/arch/x86/kernel/cpu/intel.c
> +++ b/arch/x86/kernel/cpu/intel.c
> @@ -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);
> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/





\
 
 \ /
  Last update: 2011-08-18 19:23    [W:0.080 / U:0.024 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site