diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-15 13:38:51 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-15 13:38:51 +0300 |
| commit | 2372673c64c02fd7663fc365964d1a18582469a0 (patch) | |
| tree | ad4fb22d49447f1e36963349d842e13351d296a9 /arch/x86/kernel/cpu/intel.c | |
| parent | f800c25b7a762d445ba1439a2428c8362157eba6 (diff) | |
| parent | b34630014dad0ba69aadd8deb231ddc6d2efcf53 (diff) | |
| download | linux-2372673c64c02fd7663fc365964d1a18582469a0.tar.xz | |
Merge tag 'x86_queue' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/cleanups
Pull minor x86 cleanups from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 9cc6b6f25f42..94d7dcb12145 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -487,10 +487,8 @@ static void init_intel(struct cpuinfo_x86 *c) rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb); 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"); + pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n"); + pr_warn_once("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); } |