x86/msr: Add explicit includes of <asm/msr.h>

For historic reasons there are some TSC-related functions in the
<asm/msr.h> header, even though there's an <asm/tsc.h> header.

To facilitate the relocation of rdtsc{,_ordered}() from <asm/msr.h>
to <asm/tsc.h> and to eventually eliminate the inclusion of
<asm/msr.h> in <asm/tsc.h>, add an explicit <asm/msr.h> dependency
to the source files that reference definitions from <asm/msr.h>.

[ mingo: Clarified the changelog. ]

Signed-off-by: Xin Li (Intel) <xin@zytor.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Uros Bizjak <ubizjak@gmail.com>
Link: https://lore.kernel.org/r/20250501054241.1245648-1-xin@zytor.com
This commit is contained in:
Xin Li (Intel)
2025-05-02 10:23:47 +02:00
committed by Ingo Molnar
parent bdfda83a6b
commit efef7f184f
123 changed files with 139 additions and 9 deletions
+1
View File
@@ -43,6 +43,7 @@
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/cpuid.h> #include <asm/cpuid.h>
#include <asm/cmdline.h> #include <asm/cmdline.h>
#include <asm/msr.h>
#define DR7_RESET_VALUE 0x400 #define DR7_RESET_VALUE 0x400
+1
View File
@@ -9,6 +9,7 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <asm/apicdef.h> #include <asm/apicdef.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/msr.h>
#include <asm/nmi.h> #include <asm/nmi.h>
#include "../perf_event.h" #include "../perf_event.h"
+1
View File
@@ -15,6 +15,7 @@
#include <linux/sched/clock.h> #include <linux/sched/clock.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
+2
View File
@@ -16,6 +16,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/amd-iommu.h> #include <linux/amd-iommu.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
#include "iommu.h" #include "iommu.h"
+1
View File
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <asm/msr.h>
#include <asm/perf_event.h> #include <asm/perf_event.h>
#include "../perf_event.h" #include "../perf_event.h"
+1
View File
@@ -11,6 +11,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
/* Event code: LSB 8 bits, passed in attr->config any other bit is reserved. */ /* Event code: LSB 8 bits, passed in attr->config any other bit is reserved. */
+1
View File
@@ -32,6 +32,7 @@
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
#include <asm/msr.h>
#include <asm/nmi.h> #include <asm/nmi.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/alternative.h> #include <asm/alternative.h>
+1
View File
@@ -17,6 +17,7 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/perf_event.h> #include <asm/perf_event.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
+1
View File
@@ -23,6 +23,7 @@
#include <asm/intel_pt.h> #include <asm/intel_pt.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
+1
View File
@@ -111,6 +111,7 @@
#include <linux/nospec.h> #include <linux/nospec.h>
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/intel-family.h> #include <asm/intel-family.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
#include "../probe.h" #include "../probe.h"
+1
View File
@@ -10,6 +10,7 @@
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/insn.h> #include <asm/insn.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/msr.h>
#include <asm/timer.h> #include <asm/timer.h>
#include "../perf_event.h" #include "../perf_event.h"
+1
View File
@@ -5,6 +5,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/hardirq.h> #include <asm/hardirq.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
+1
View File
@@ -13,6 +13,7 @@
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/hardirq.h> #include <asm/hardirq.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
+1
View File
@@ -3,6 +3,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
+1
View File
@@ -24,6 +24,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/intel_pt.h> #include <asm/intel_pt.h>
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/msr.h>
#include "../perf_event.h" #include "../perf_event.h"
#include "pt.h" #include "pt.h"
+1
View File
@@ -3,6 +3,7 @@
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/intel-family.h> #include <asm/intel-family.h>
#include <asm/msr.h>
#include "uncore.h" #include "uncore.h"
#include "uncore_discovery.h" #include "uncore_discovery.h"
+1
View File
@@ -5,6 +5,7 @@
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <asm/msr.h>
#include "uncore.h" #include "uncore.h"
#include "uncore_discovery.h" #include "uncore_discovery.h"
+1
View File
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Nehalem-EX/Westmere-EX uncore support */ /* Nehalem-EX/Westmere-EX uncore support */
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/msr.h>
#include "uncore.h" #include "uncore.h"
/* NHM-EX event control */ /* NHM-EX event control */
+1
View File
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* Nehalem/SandBridge/Haswell/Broadwell/Skylake uncore support */ /* Nehalem/SandBridge/Haswell/Broadwell/Skylake uncore support */
#include <asm/msr.h>
#include "uncore.h" #include "uncore.h"
#include "uncore_discovery.h" #include "uncore_discovery.h"
+1
View File
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* SandyBridge-EP/IvyTown uncore support */ /* SandyBridge-EP/IvyTown uncore support */
#include <asm/cpu_device_id.h> #include <asm/cpu_device_id.h>
#include <asm/msr.h>
#include "uncore.h" #include "uncore.h"
#include "uncore_discovery.h" #include "uncore_discovery.h"

Some files were not shown because too many files have changed in this diff Show More