Skip to content

Commit 1b5f159

Browse files
committed
tools headers disabled-features: Sync with the kernel sources
To pick the changes from: e0bddc1 ("x86/mm: Reduce untagged_addr() overhead for systems without LAM") 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: Adrian Hunter <adrian.hunter@intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/lkml/ZGTpdlzrlRjjnY6K@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 29719e3 commit 1b5f159

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@
7575
# define DISABLE_CALL_DEPTH_TRACKING (1 << (X86_FEATURE_CALL_DEPTH & 31))
7676
#endif
7777

78+
#ifdef CONFIG_ADDRESS_MASKING
79+
# define DISABLE_LAM 0
80+
#else
81+
# define DISABLE_LAM (1 << (X86_FEATURE_LAM & 31))
82+
#endif
83+
7884
#ifdef CONFIG_INTEL_IOMMU_SVM
7985
# define DISABLE_ENQCMD 0
8086
#else
@@ -115,7 +121,7 @@
115121
#define DISABLED_MASK10 0
116122
#define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \
117123
DISABLE_CALL_DEPTH_TRACKING)
118-
#define DISABLED_MASK12 0
124+
#define DISABLED_MASK12 (DISABLE_LAM)
119125
#define DISABLED_MASK13 0
120126
#define DISABLED_MASK14 0
121127
#define DISABLED_MASK15 0

0 commit comments

Comments
 (0)