diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:50:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:50:59 +0100 |
| commit | 8c490b42fe91c10d5756efe56014240c669e7720 (patch) | |
| tree | 305c483f5d51cf9866ab4c75282da89d333247c1 /arch/x86/include | |
| parent | aaeed6ecc1253ce1463fa1aca0b70a4ccbc9fa75 (diff) | |
| parent | 83aa52ffed5d35a08e24452d0471e1684075cdf8 (diff) | |
| download | lwn-8c490b42fe91c10d5756efe56014240c669e7720.tar.gz lwn-8c490b42fe91c10d5756efe56014240c669e7720.zip | |
Merge branch 'x86/pasid' into x86/core, to resolve conflicts
Conflicts:
tools/objtool/arch/x86/decode.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/disabled-features.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index 8f28fafa98b3..1231d63f836d 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -56,8 +56,11 @@ # define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31)) #endif -/* Force disable because it's broken beyond repair */ -#define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) +#ifdef CONFIG_INTEL_IOMMU_SVM +# define DISABLE_ENQCMD 0 +#else +# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31)) +#endif #ifdef CONFIG_X86_SGX # define DISABLE_SGX 0 |