diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-11-22 03:06:46 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-11-22 03:06:45 -0800 |
| commit | ee5ed64f739b51590ac586f8386f90f75b4777d3 (patch) | |
| tree | 0f27b4f5b70cb27205462de34562beb627597847 /arch/x86/include/asm/processor.h | |
| parent | ee4cdc8d6314c7fbcc487a9901c550f1beb82da3 (diff) | |
| parent | acd0aacb7e54796116ea6964c17e8874376dbe34 (diff) | |
Merge "Merge android-4.4-p.202 (a4d443b7) into msm-4.4"
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index dab73faef9b0..cac54e61c299 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -852,4 +852,11 @@ enum mds_mitigations { MDS_MITIGATION_VMWERV, }; +enum taa_mitigations { + TAA_MITIGATION_OFF, + TAA_MITIGATION_UCODE_NEEDED, + TAA_MITIGATION_VERW, + TAA_MITIGATION_TSX_DISABLED, +}; + #endif /* _ASM_X86_PROCESSOR_H */ |