Skip to content

Commit 1709528

Browse files
committed
x86/CPU/AMD: Get rid of amd_erratum_383[]
Set it in init_amd_gh() unconditionally as that is the F10h init function. No functional changes. Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Nikolay Borisov <[email protected]> Link: http://lore.kernel.org/r/[email protected]
1 parent 54c33e2 commit 1709528

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

arch/x86/kernel/cpu/amd.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ static const int amd_erratum_400[] =
6363
AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf),
6464
AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf));
6565

66-
static const int amd_erratum_383[] =
67-
AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf));
68-
6966
static const int amd_erratum_1485[] =
7067
AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf),
7168
AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf));
@@ -876,8 +873,7 @@ static void init_amd_gh(struct cpuinfo_x86 *c)
876873
*/
877874
msr_clear_bit(MSR_AMD64_BU_CFG2, 24);
878875

879-
if (cpu_has_amd_erratum(c, amd_erratum_383))
880-
set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
876+
set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
881877
}
882878

883879
static void init_amd_ln(struct cpuinfo_x86 *c)

0 commit comments

Comments
 (0)