Skip to content

Commit ac4b069

Browse files
committed
tools arch x86: Sync the msr-index.h copy with the kernel sources
To pick up the changes from these csets: 53bc516 ("x86/msr: Move ARCH_CAP_XAPIC_DISABLE bit definition to its rightful place") That patch just move definitions around, so this just silences this perf build warning: Warning: Kernel ABI header differences: diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index. Cc: Adrian Hunter <[email protected]> Cc: Borislav Petkov (AMD) <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Pawan Gupta <[email protected]> Link: https://lore.kernel.org/lkml/ZlYe8jOzd1_DyA7X@x1 Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent da42b52 commit ac4b069

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

tools/arch/x86/include/asm/msr-index.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@
170170
* CPU is not affected by Branch
171171
* History Injection.
172172
*/
173+
#define ARCH_CAP_XAPIC_DISABLE BIT(21) /*
174+
* IA32_XAPIC_DISABLE_STATUS MSR
175+
* supported
176+
*/
173177
#define ARCH_CAP_PBRSB_NO BIT(24) /*
174178
* Not susceptible to Post-Barrier
175179
* Return Stack Buffer Predictions.
@@ -192,11 +196,6 @@
192196
* File.
193197
*/
194198

195-
#define ARCH_CAP_XAPIC_DISABLE BIT(21) /*
196-
* IA32_XAPIC_DISABLE_STATUS MSR
197-
* supported
198-
*/
199-
200199
#define MSR_IA32_FLUSH_CMD 0x0000010b
201200
#define L1D_FLUSH BIT(0) /*
202201
* Writeback and invalidate the

0 commit comments

Comments
 (0)