Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit d679783

Browse files
committed
Merge tag 'x86_cpu_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu model updates from Borislav Petkov: - Flip the logic to add feature names to /proc/cpuinfo to having to explicitly specify the flag if there's a valid reason to show it in /proc/cpuinfo - Switch a bunch of Intel x86 model checking code to the new CPU model defines - Fixes and cleanups * tag 'x86_cpu_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/cpu/intel: Drop stray FAM6 check with new Intel CPU model defines x86/cpufeatures: Flip the /proc/cpuinfo appearance logic x86/CPU/AMD: Always inline amd_clear_divider() x86/mce/inject: Add missing MODULE_DESCRIPTION() line perf/x86/rapl: Switch to new Intel CPU model defines x86/boot: Switch to new Intel CPU model defines x86/cpu: Switch to new Intel CPU model defines perf/x86/intel: Switch to new Intel CPU model defines x86/virt/tdx: Switch to new Intel CPU model defines x86/PCI: Switch to new Intel CPU model defines x86/cpu/intel: Switch to new Intel CPU model defines x86/platform/intel-mid: Switch to new Intel CPU model defines x86/pconfig: Remove unused MKTME pconfig code x86/cpu: Remove useless work in detect_tme_early()
2 parents 2439a5e + 34b3fc5 commit d679783

File tree

17 files changed

+701
-905
lines changed

17 files changed

+701
-905
lines changed

arch/x86/boot/cpucheck.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ int check_knl_erratum(void)
203203
*/
204204
if (!is_intel() ||
205205
cpu.family != 6 ||
206-
cpu.model != INTEL_FAM6_XEON_PHI_KNL)
206+
cpu.model != 0x57 /*INTEL_XEON_PHI_KNL*/)
207207
return 0;
208208

209209
/*

0 commit comments

Comments
 (0)