diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 04:50:09 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 04:50:09 +0300 |
| commit | 80f33a5fdf66d4338789e8aa80589bda088cb35d (patch) | |
| tree | a33c7626dc8555da46b9fef94bbc568336baa10d /arch/x86/kernel/cpu/intel.c | |
| parent | 7453311d68f16a5c587c3cbf19563c9a4fbbd41a (diff) | |
| parent | d505ad1d66c9cd31db5ab0d2c7bcb2a47e5bb29e (diff) | |
| download | linux-80f33a5fdf66d4338789e8aa80589bda088cb35d.tar.xz | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Misc cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/rtc: Remove duplicate const specifier
x86, early_serial_console: Remove unnecessary check
x86, early_serial_console: Remove unused macro XMTRDY
x86, setup: Rename BOOT_ISDIGIT_H to BOOT_CTYPE_H
x86, CPU: Fix trivial printk formatting issues with dmesg
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); } |