Revert "x86/apic: Ignore secondary threads if nosmt=force"

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / kernel / apic / apic.c

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index dcb322a1a1aabecc6946b4be377f9b8d3dd99118..4a215b6e41f63e05d4767dbeb0453397d6014c0b 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2195,16 +2195,6 @@ bool apic_id_is_primary_thread(unsigned int apicid)
        return !(apicid & mask);
 }
 
-/**
- * apic_id_disabled - Check whether APIC ID is disabled via SMT control
- * @id:        APIC ID to check
- */
-bool apic_id_disabled(unsigned int id)
-{
-       return (cpu_smt_control == CPU_SMT_FORCE_DISABLED &&
-               !apic_id_is_primary_thread(id));
-}
-
 /*
  * Should use this API to allocate logical CPU IDs to keep nr_logical_cpuids
  * and cpuid_to_apicid[] synchronized.
@@ -2300,15 +2290,6 @@ int generic_processor_info(int apicid, int version)
                return -EINVAL;
        }
 
-       /*
-        * If SMT is force disabled and the APIC ID belongs to
-        * a secondary thread, ignore it.
-        */
-       if (apic_id_disabled(apicid)) {
-               pr_info_once("Ignoring secondary SMT threads\n");
-               return -EINVAL;
-       }
-
        if (apicid == boot_cpu_physical_apicid) {
                /*
                 * x86_bios_cpu_apicid is required to have processors listed