leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/split_lock: Update to use X86_MATCH_INTEL_FAM6_MODEL()

Browse Source 
The SPLIT_LOCK_CPU() macro escaped the tree-wide sweep for old-style
initialization. Update to use X86_MATCH_INTEL_FAM6_MODEL().

Fixes: 6650cdd9a8 ("x86/split_lock: Enable split lock detection by kernel")
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200416205754.21177-2-tony.luck@intel.com
This commit is contained in:
Tony Luck 2020-04-16 13:57:52 -07:00 committed by Thomas Gleixner
parent b0e387c3ec
commit 3ab0762d1e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/cpu/intel.c
View File

@ -1119,8 +1119,6 @@ void switch_to_sld(unsigned long tifn)
sld_update_msr(!(tifn & _TIF_SLD)); sld_update_msr(!(tifn & _TIF_SLD));
} }
#define SPLIT_LOCK_CPU(model) {X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY}
/* /*
* The following processors have the split lock detection feature. But * The following processors have the split lock detection feature. But
* since they don't have the IA32_CORE_CAPABILITIES MSR, the feature cannot * since they don't have the IA32_CORE_CAPABILITIES MSR, the feature cannot
@ -1128,8 +1126,8 @@ void switch_to_sld(unsigned long tifn)
* processors. * processors.
*/ */
static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = { static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {
SPLIT_LOCK_CPU(INTEL_FAM6_ICELAKE_X), X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, 0),
SPLIT_LOCK_CPU(INTEL_FAM6_ICELAKE_L), X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, 0),
{} {}
}; };