x86, cpu: trivial printk formatting fixes
PATCH v2 1/1 x86, cpu: trivial printk formatting fixes
A 2 line printk makes dmesg output messy, because the second line does not get a timestamp. For example:
[ 0.012863] CPU0: Thermal monitoring enabled (TM1) [ 0.012869] Last level iTLB entries: 4KB 1024, 2MB 1024, 4MB 1024 Last level dTLB entries: 4KB 1024, 2MB 1024, 4MB 1024, 1GB 4 [ 0.012958] Freeing SMP alternatives memory: 28K (ffffffff81d86000 - ffffffff81d8d000) [ 0.014961] dmar: Host address width 39
V2: Revert change to log level, only fix the newline formatting issue
Signed-off-by Steven Honeyman <[email protected]>
--- arch/x86/kernel/cpu/common.c | 11 ++++++----- arch/x86/kernel/cpu/intel.c | 6 ++---- 2 files changed, 8 insertions(+), 9 deletions(-)
arch/x86/kernel/cpu/common.c +6 -5
@@ -494,12 +494,13 @@ void cpu_detect_tlb(struct cpuinfo_x86 *c)if (this_cpu->c_detect_tlb) this_cpu->c_detect_tlb (c); -printk (KERN_INFO "Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n" -"Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d, 1GB %d\n" , +pr_info ("Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n" , tlb_lli_4k[ENTRIES ], tlb_lli_2m[ENTRIES ], - tlb_lli_4m[ENTRIES ], tlb_lld_4k[ENTRIES ], - tlb_lld_2m[ENTRIES ], tlb_lld_4m[ENTRIES ], - tlb_lld_1g[ENTRIES ]); + tlb_lli_4m[ENTRIES ]); + +pr_info ("Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d, 1GB %d\n" , + tlb_lld_4k[ENTRIES ], tlb_lld_2m[ENTRIES ], + tlb_lld_4m[ENTRIES ], tlb_lld_1g[ENTRIES ]); }void detect_ht (struct cpuinfo_x86 *c)
arch/x86/kernel/cpu/intel.c +2 -4
@@ -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); }
Signature · 1 line
2.1.3
Borislav Petkov
maintainerQuoted 9 lines · Steven Honeyman
A 2 line printk makes dmesg output messy, because the second line does not get a timestamp. For example:
[ 0.012863] CPU0: Thermal monitoring enabled (TM1) [ 0.012869] Last level iTLB entries: 4KB 1024, 2MB 1024, 4MB 1024 Last level dTLB entries: 4KB 1024, 2MB 1024, 4MB 1024, 1GB 4 [ 0.012958] Freeing SMP alternatives memory: 28K (ffffffff81d86000 - ffffffff81d8d000) [ 0.014961] dmar: Host address width 39
Quoted 3 lines
V2: Revert change to log level, only fix the newline formatting issue
Signed-off-by Steven Honeyman <[email protected]>
Yeah, patch is fine. I'm sorry that I forgot to ask you to add the reasoning *why* this change is needed, i.e., all the details about dmesg accessing /dev/kmsg directly and so on.
I think we want to explain why *really* this change is being done as some old dmesg, as we saw, do work because they're using syslog(2) and so on...
Thanks.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--