Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / kernel / cpu / bugs.c

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index c6fa3ef10b4ef2f400ac256973958b51861479db..91c2561b905f3e1b264e72eec420af50bd820469 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -787,7 +787,7 @@ static void update_mds_branch_idle(void)
 
 #define MDS_MSG_SMT "MDS CPU bug present and SMT on, data leak possible. See https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html for more details.\n"
 
-void arch_smt_update(void)
+void cpu_bugs_smt_update(void)
 {
        /* Enhanced IBRS implies STIBP. No update required. */
        if (spectre_v2_enabled == SPECTRE_V2_IBRS_ENHANCED)
@@ -1184,15 +1184,15 @@ static void override_cache_bits(struct cpuinfo_x86 *c)
        case INTEL_FAM6_WESTMERE:
        case INTEL_FAM6_SANDYBRIDGE:
        case INTEL_FAM6_IVYBRIDGE:
-       case INTEL_FAM6_HASWELL_CORE:
-       case INTEL_FAM6_HASWELL_ULT:
-       case INTEL_FAM6_HASWELL_GT3E:
-       case INTEL_FAM6_BROADWELL_CORE:
-       case INTEL_FAM6_BROADWELL_GT3E:
-       case INTEL_FAM6_SKYLAKE_MOBILE:
-       case INTEL_FAM6_SKYLAKE_DESKTOP:
-       case INTEL_FAM6_KABYLAKE_MOBILE:
-       case INTEL_FAM6_KABYLAKE_DESKTOP:
+       case INTEL_FAM6_HASWELL:
+       case INTEL_FAM6_HASWELL_L:
+       case INTEL_FAM6_HASWELL_G:
+       case INTEL_FAM6_BROADWELL:
+       case INTEL_FAM6_BROADWELL_G:
+       case INTEL_FAM6_SKYLAKE_L:
+       case INTEL_FAM6_SKYLAKE:
+       case INTEL_FAM6_KABYLAKE_L:
+       case INTEL_FAM6_KABYLAKE:
                if (c->x86_cache_bits < 44)
                        c->x86_cache_bits = 44;
                break;