Commit 0bc1d0e2 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers disabled-cpufeatures: Sync with the kernel sources 

To pick the changes from:

  15e15d64 ("x86/cpufeatures: Add X86_FEATURE_XENPV to disabled-features.h")

This only causes these perf files to be rebuilt:

  CC       /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o
  CC       /tmp/build/perf/bench/mem-memset-x86-64-asm.o

And addresses 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:  Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/Y6B2w3WqifB%2FV70T@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 30d647f5

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

+15 −2
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ 
# define DISABLE_UNRET		(1 << (X86_FEATURE_UNRET & 31))

#endif



#ifdef CONFIG_CALL_DEPTH_TRACKING

# define DISABLE_CALL_DEPTH_TRACKING	0

#else

# define DISABLE_CALL_DEPTH_TRACKING	(1 << (X86_FEATURE_CALL_DEPTH & 31))

#endif



#ifdef CONFIG_INTEL_IOMMU_SVM

# define DISABLE_ENQCMD		0

#else
@@ -81,6 +87,12 @@ 
# define DISABLE_SGX	(1 << (X86_FEATURE_SGX & 31))

#endif



#ifdef CONFIG_XEN_PV

# define DISABLE_XENPV		0

#else

# define DISABLE_XENPV		(1 << (X86_FEATURE_XENPV & 31))

#endif



#ifdef CONFIG_INTEL_TDX_GUEST

# define DISABLE_TDX_GUEST	0

#else
@@ -98,10 +110,11 @@ 
#define DISABLED_MASK5	0

#define DISABLED_MASK6	0

#define DISABLED_MASK7	(DISABLE_PTI)

#define DISABLED_MASK8	(DISABLE_TDX_GUEST)

#define DISABLED_MASK8	(DISABLE_XENPV|DISABLE_TDX_GUEST)

#define DISABLED_MASK9	(DISABLE_SGX)

#define DISABLED_MASK10	0

#define DISABLED_MASK11	(DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET)

#define DISABLED_MASK11	(DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \

			 DISABLE_CALL_DEPTH_TRACKING)

#define DISABLED_MASK12	0

#define DISABLED_MASK13	0

#define DISABLED_MASK14	0