]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
tools arch x86: Sync the msr-index.h copy with the kernel sources
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 28 May 2024 18:10:28 +0000 (15:10 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 28 May 2024 18:14:32 +0000 (15:14 -0300)
To pick up the changes from these csets:

  53bc516ade85a764 ("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 <adrian.hunter@intel.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Link: https://lore.kernel.org/lkml/ZlYe8jOzd1_DyA7X@x1
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/arch/x86/include/asm/msr-index.h

index e72c2b87295799af9d44eb84f59d095f4f90acfd..e022e6eb766c64050aedcefc5b8962c2049184c6 100644 (file)
                                                 * CPU is not affected by Branch
                                                 * History Injection.
                                                 */
+#define ARCH_CAP_XAPIC_DISABLE         BIT(21) /*
+                                                * IA32_XAPIC_DISABLE_STATUS MSR
+                                                * supported
+                                                */
 #define ARCH_CAP_PBRSB_NO              BIT(24) /*
                                                 * Not susceptible to Post-Barrier
                                                 * Return Stack Buffer Predictions.
                                                 * File.
                                                 */
 
-#define ARCH_CAP_XAPIC_DISABLE         BIT(21) /*
-                                                * IA32_XAPIC_DISABLE_STATUS MSR
-                                                * supported
-                                                */
-
 #define MSR_IA32_FLUSH_CMD             0x0000010b
 #define L1D_FLUSH                      BIT(0)  /*
                                                 * Writeback and invalidate the