diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-20 14:47:42 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-20 14:47:42 -0400 |
| commit | 3b28201b7706c3164541ae3f433a2558de2b675b (patch) | |
| tree | 463f216bfa061c38f8bec8205ea384f1edb8d8cc | |
| parent | 3733f7e9f8a6179372cb74d6a59a830544f3d08d (diff) | |
| download | longterm-queue-4.18-3b28201b7706c3164541ae3f433a2558de2b675b.tar.gz | |
tools: ctxt refresh for perf header #2
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with-.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/queue/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with-.patch b/queue/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with-.patch index 4089986..85c926d 100644 --- a/queue/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with-.patch +++ b/queue/tools-arch-x86-Sync-asm-cpufeatures.h-with-the-with-.patch @@ -1,4 +1,4 @@ -From 0ac10d87a571ae7d68c7f70f1c2229388f1dce9e Mon Sep 17 00:00:00 2001 +From 11ca53d8439d3eeb6f0ffd03129e04e66f322491 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo <acme@redhat.com> Date: Mon, 19 Aug 2019 10:53:20 -0300 Subject: [PATCH] tools arch x86: Sync asm/cpufeatures.h with the with the @@ -27,19 +27,19 @@ Link: https://lkml.kernel.org/n/tip-860dq1qie2cpnfghlpcnxrzr@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h -index 998c2cc08363..e880f2408e29 100644 +index 117a0bc5c958..1fb6caa4e442 100644 --- a/tools/arch/x86/include/asm/cpufeatures.h +++ b/tools/arch/x86/include/asm/cpufeatures.h -@@ -281,6 +281,8 @@ - #define X86_FEATURE_CQM_OCCUP_LLC (11*32+ 1) /* LLC occupancy monitoring */ - #define X86_FEATURE_CQM_MBM_TOTAL (11*32+ 2) /* LLC Total MBM monitoring */ - #define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3) /* LLC Local MBM monitoring */ +@@ -275,6 +275,8 @@ + #define X86_FEATURE_CQM_OCCUP_LLC (12*32+ 0) /* LLC occupancy monitoring */ + #define X86_FEATURE_CQM_MBM_TOTAL (12*32+ 1) /* LLC Total MBM monitoring */ + #define X86_FEATURE_CQM_MBM_LOCAL (12*32+ 2) /* LLC Local MBM monitoring */ +#define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4) /* "" LFENCE in user entry SWAPGS path */ +#define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */ - /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ - #define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* AVX512 BFLOAT16 instructions */ -@@ -394,5 +396,6 @@ + /* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */ + #define X86_FEATURE_CLZERO (13*32+ 0) /* CLZERO instruction */ +@@ -379,5 +381,6 @@ #define X86_BUG_L1TF X86_BUG(18) /* CPU is affected by L1 Terminal Fault */ #define X86_BUG_MDS X86_BUG(19) /* CPU is affected by Microarchitectural data sampling */ #define X86_BUG_MSBDS_ONLY X86_BUG(20) /* CPU is only affected by the MSDBS variant of BUG_MDS */ |