| From foo@baz Tue Aug 14 16:14:56 CEST 2018 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Wed, 6 Jun 2018 00:36:15 +0200 |
| Subject: x86/cpu: Remove the pointless CPU printout |
| |
| From: Thomas Gleixner <tglx@linutronix.de> |
| |
| commit 55e6d279abd92cfd7576bba031e7589be8475edb upstream |
| |
| The value of this printout is dubious at best and there is no point in |
| having it in two different places along with convoluted ways to reach it. |
| |
| Remove it completely. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
| Acked-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/kernel/cpu/common.c | 20 +++++--------------- |
| arch/x86/kernel/cpu/topology.c | 11 ----------- |
| 2 files changed, 5 insertions(+), 26 deletions(-) |
| |
| --- a/arch/x86/kernel/cpu/common.c |
| +++ b/arch/x86/kernel/cpu/common.c |
| @@ -611,13 +611,12 @@ void detect_ht(struct cpuinfo_x86 *c) |
| #ifdef CONFIG_SMP |
| u32 eax, ebx, ecx, edx; |
| int index_msb, core_bits; |
| - static bool printed; |
| |
| if (!cpu_has(c, X86_FEATURE_HT)) |
| return; |
| |
| if (cpu_has(c, X86_FEATURE_CMP_LEGACY)) |
| - goto out; |
| + return; |
| |
| if (cpu_has(c, X86_FEATURE_XTOPOLOGY)) |
| return; |
| @@ -626,14 +625,14 @@ void detect_ht(struct cpuinfo_x86 *c) |
| |
| smp_num_siblings = (ebx & 0xff0000) >> 16; |
| |
| + if (!smp_num_siblings) |
| + smp_num_siblings = 1; |
| + |
| if (smp_num_siblings == 1) { |
| pr_info_once("CPU0: Hyper-Threading is disabled\n"); |
| - goto out; |
| + return; |
| } |
| |
| - if (smp_num_siblings <= 1) |
| - goto out; |
| - |
| index_msb = get_count_order(smp_num_siblings); |
| c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, index_msb); |
| |
| @@ -645,15 +644,6 @@ void detect_ht(struct cpuinfo_x86 *c) |
| |
| c->cpu_core_id = apic->phys_pkg_id(c->initial_apicid, index_msb) & |
| ((1 << core_bits) - 1); |
| - |
| -out: |
| - if (!printed && (c->x86_max_cores * smp_num_siblings) > 1) { |
| - pr_info("CPU: Physical Processor ID: %d\n", |
| - c->phys_proc_id); |
| - pr_info("CPU: Processor Core ID: %d\n", |
| - c->cpu_core_id); |
| - printed = 1; |
| - } |
| #endif |
| } |
| |
| --- a/arch/x86/kernel/cpu/topology.c |
| +++ b/arch/x86/kernel/cpu/topology.c |
| @@ -32,7 +32,6 @@ void detect_extended_topology(struct cpu |
| unsigned int eax, ebx, ecx, edx, sub_index; |
| unsigned int ht_mask_width, core_plus_mask_width; |
| unsigned int core_select_mask, core_level_siblings; |
| - static bool printed; |
| |
| if (c->cpuid_level < 0xb) |
| return; |
| @@ -85,15 +84,5 @@ void detect_extended_topology(struct cpu |
| c->apicid = apic->phys_pkg_id(c->initial_apicid, 0); |
| |
| c->x86_max_cores = (core_level_siblings / smp_num_siblings); |
| - |
| - if (!printed) { |
| - pr_info("CPU: Physical Processor ID: %d\n", |
| - c->phys_proc_id); |
| - if (c->x86_max_cores > 1) |
| - pr_info("CPU: Processor Core ID: %d\n", |
| - c->cpu_core_id); |
| - printed = 1; |
| - } |
| - return; |
| #endif |
| } |