x86/cpu: Remove the pointless CPU printout

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>
CVE-2018-3620
CVE-2018-3646

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 046509f2f1d2dbcc186e021b3d8d57bfee4cdcee..b7beb06d80aecd38ef698c019a782f826cfea1e6 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -663,13 +663,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;
@@ -678,14 +677,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);
 
@@ -697,15 +696,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 81c0afb39d0ab6259be8f2cce0e1def5c4a2119d..1072b5eda607764f57970cbfcae627372a1ab82d 100644 (file)
--- a/arch/x86/kernel/cpu/topology.c
+++ b/arch/x86/kernel/cpu/topology.c
@@ -33,7 +33,6 @@ int 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 -1;
@@ -86,15 +85,6 @@ int 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;
-       }
 #endif
        return 0;
 }