x86/cpu: Remove the pointless CPU printout

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index b7cee3424bcd6c1d3fc7b970db70c3f94519e714..835cd1c3400eb92b032fa1f4d4a0e572439e8b07 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -619,13 +619,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;
@@ -634,14 +633,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);
 
@@ -653,15 +652,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
 }
 

diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
index b099024d339c386929dbda450a328bc2b3887377..938276f98ec1a6725ce85af4d6c5d9cb24afa83f 100644 (file)
--- a/arch/x86/kernel/cpu/topology.c
+++ b/arch/x86/kernel/cpu/topology.c
@@ -33,7 +33,6 @@ void detect_extended_topology(struct cpuinfo_x86 *c)
        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;
@@ -86,15 +85,5 @@ void detect_extended_topology(struct cpuinfo_x86 *c)
        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
 }