aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/intel.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index da2401a4b0f4..a4c4ff9b27e4 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -79,8 +79,15 @@ static void probe_xeon_phi_r3mwait(struct cpuinfo_x86 *c)
79 * Ring 3 MONITOR/MWAIT feature cannot be detected without 79 * Ring 3 MONITOR/MWAIT feature cannot be detected without
80 * cpu model and family comparison. 80 * cpu model and family comparison.
81 */ 81 */
82 if (c->x86 != 6 || c->x86_model != INTEL_FAM6_XEON_PHI_KNL) 82 if (c->x86 != 6)
83 return; 83 return;
84 switch (c->x86_model) {
85 case INTEL_FAM6_XEON_PHI_KNL:
86 case INTEL_FAM6_XEON_PHI_KNM:
87 break;
88 default:
89 return;
90 }
84 91
85 if (ring3mwait_disabled) { 92 if (ring3mwait_disabled) {
86 msr_clear_bit(MSR_MISC_FEATURE_ENABLES, 93 msr_clear_bit(MSR_MISC_FEATURE_ENABLES,