Skip to content

Commit 1efe4cb

Browse files
committed
tools headers cpufeatures: Sync with the kernel sources
To pick the changes in: 7c1ef59 ("x86/cpufeatures: Re-enable ENQCMD") That causes only these 'perf bench' objects to rebuild: CC /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o CC /tmp/build/perf/bench/mem-memset-x86-64-asm.o And addresses these perf build warnings: 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 <bp@suse.de> Cc: Fenghua Yu <fenghua.yu@intel.com> Link: https://lore.kernel.org/lkml/YjzX+PknzGoKaGMX@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent d0a0a51 commit 1efe4cb

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

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

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

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

6265
#ifdef CONFIG_X86_SGX
6366
# define DISABLE_SGX 0

0 commit comments

Comments
 (0)