diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-05-02 13:12:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-05-02 13:12:31 +0200 |
| commit | ad112b3a759cefc245695f7e612f17e6f38d2cc1 (patch) | |
| tree | d5fa837d0f996dbf15e4fd89a7f89b9b660f5796 /tools/arch/x86/include/asm/disabled-features.h | |
| parent | 854dd99b5ddc9d90e31e5f112462a5994dd31810 (diff) | |
| parent | e67572cd2204894179d89bd7b984072f19313b03 (diff) | |
| download | linux-ad112b3a759cefc245695f7e612f17e6f38d2cc1.tar.gz linux-ad112b3a759cefc245695f7e612f17e6f38d2cc1.tar.bz2 linux-ad112b3a759cefc245695f7e612f17e6f38d2cc1.zip | |
Merge tag 'v6.9-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/arch/x86/include/asm/disabled-features.h')
| -rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index 1f23960d2b06..c492bdc97b05 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h @@ -123,6 +123,12 @@ # define DISABLE_FRED (1 << (X86_FEATURE_FRED & 31)) #endif +#ifdef CONFIG_KVM_AMD_SEV +#define DISABLE_SEV_SNP 0 +#else +#define DISABLE_SEV_SNP (1 << (X86_FEATURE_SEV_SNP & 31)) +#endif + /* * Make sure to add features to the correct mask */ @@ -147,8 +153,9 @@ DISABLE_ENQCMD) #define DISABLED_MASK17 0 #define DISABLED_MASK18 (DISABLE_IBT) -#define DISABLED_MASK19 0 +#define DISABLED_MASK19 (DISABLE_SEV_SNP) #define DISABLED_MASK20 0 -#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 21) +#define DISABLED_MASK21 0 +#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 22) #endif /* _ASM_X86_DISABLED_FEATURES_H */ |