The following commit has been merged into the perf/core branch of tip: Commit-ID: e1706b30e939d3e62c2a2b9415ed9c6313bbb8e9 Gitweb: https://git.kernel.org/tip/e1706b30e939d3e62c2a2b9415ed9c6313bbb8e9 Author: Kim Phillips <kim.phillips@xxxxxxx> AuthorDate: Tue, 17 Aug 2021 17:10:45 -05:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Fri, 20 Aug 2021 12:33:13 +02:00 perf/amd/uncore: Use linux/ include paths instead of asm/ Found by checkpatch. Signed-off-by: Kim Phillips <kim.phillips@xxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20210817221048.88063-6-kim.phillips@xxxxxxx --- arch/x86/events/amd/uncore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c index 05bdb4c..7fb50ad 100644 --- a/arch/x86/events/amd/uncore.c +++ b/arch/x86/events/amd/uncore.c @@ -12,11 +12,11 @@ #include <linux/init.h> #include <linux/cpu.h> #include <linux/cpumask.h> +#include <linux/cpufeature.h> +#include <linux/smp.h> -#include <asm/cpufeature.h> #include <asm/perf_event.h> #include <asm/msr.h> -#include <asm/smp.h> #define NUM_COUNTERS_NB 4 #define NUM_COUNTERS_L2 4
|