diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-09-07 18:30:47 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-09-07 18:30:47 +0200 |
| commit | ed2ef29100644eabc6099cbf1a3aa9d938555ab8 (patch) | |
| tree | dadd3eb5d77ae2c44adc92869c662292bd652f46 /arch/x86/kernel/cpu/intel.c | |
| parent | 732b53146ac8f604e45c593efe0579f78205fdcc (diff) | |
| parent | df88f3181f10565c6e3a89eb6f0f9e6afaaf15f1 (diff) | |
Merge tag 'kvm-s390-master-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: Fixes for 4.19
- Fallout from the hugetlbfs support: pfmf interpretion and locking
- VSIE: fix keywrapping for nested guests
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 401e8c133108..fc3c07fe7df5 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -150,6 +150,9 @@ static bool bad_spectre_microcode(struct cpuinfo_x86 *c) if (cpu_has(c, X86_FEATURE_HYPERVISOR)) return false; + if (c->x86 != 6) + return false; + for (i = 0; i < ARRAY_SIZE(spectre_bad_microcodes); i++) { if (c->x86_model == spectre_bad_microcodes[i].model && c->x86_stepping == spectre_bad_microcodes[i].stepping) |