Commit 3ab0762d authored by Tony Luck's avatar Tony Luck Committed by Thomas Gleixner
Browse files

x86/split_lock: Update to use X86_MATCH_INTEL_FAM6_MODEL() 



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

Fixes: 6650cdd9 ("x86/split_lock: Enable split lock detection by kernel")
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200416205754.21177-2-tony.luck@intel.com
parent b0e387c3

arch/x86/kernel/cpu/intel.c

+2 −4
Original line number Diff line number Diff line
@@ -1119,8 +1119,6 @@ void switch_to_sld(unsigned long tifn) 
	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

 * 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.

 */

static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {

	SPLIT_LOCK_CPU(INTEL_FAM6_ICELAKE_X),

	SPLIT_LOCK_CPU(INTEL_FAM6_ICELAKE_L),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		0),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		0),

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE