Skip to content

Commit 3652411

Browse files
committed
tools headers cpufeatures: Sync with the kernel sources
To pick the changes in: fb35d30 ("x86/cpufeatures: Assign dedicated feature word for CPUID_0x8000001F[EAX]") e7b6385 ("x86/cpufeatures: Add Intel SGX hardware bits") 1478b99 ("x86/cpufeatures: Mark ENQCMD as disabled when configured out") That don't cause any change in the tools, just silences this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/disabled-features.h' differs from latest version at 'arch/x86/include/asm/disabled-features.h' diff -u tools/arch/x86/include/asm/disabled-features.h arch/x86/include/asm/disabled-features.h Cc: Borislav Petkov <[email protected]> Cc: Fenghua Yu <[email protected]> Cc: Sean Christopherson <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 197eecb commit 3652411

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

tools/arch/x86/include/asm/disabled-features.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,8 @@
5656
# define DISABLE_PTI (1 << (X86_FEATURE_PTI & 31))
5757
#endif
5858

59-
#ifdef CONFIG_IOMMU_SUPPORT
60-
# define DISABLE_ENQCMD 0
61-
#else
62-
# define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))
63-
#endif
59+
/* Force disable because it's broken beyond repair */
60+
#define DISABLE_ENQCMD (1 << (X86_FEATURE_ENQCMD & 31))
6461

6562
#ifdef CONFIG_X86_SGX
6663
# define DISABLE_SGX 0

0 commit comments

Comments
 (0)