The following commit has been merged into the x86/cpu branch of tip: Commit-ID: bb5525a50601f8be7d0ffb04740e1714506e60c4 Gitweb: https://git.kernel.org/tip/bb5525a50601f8be7d0ffb04740e1714506e60c4 Author: Ashok Raj <ashok.raj@xxxxxxxxx> AuthorDate: Mon, 28 Nov 2022 09:24:51 -08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 10 Jan 2023 12:40:24 +01:00 x86/cpu: Remove redundant extern x86_read_arch_cap_msr() The prototype for the x86_read_arch_cap_msr() function has moved to arch/x86/include/asm/cpu.h - kill the redundant definition in arch/x86/kernel/cpu.h and include the header. Signed-off-by: Ashok Raj <ashok.raj@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Reviewed-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20221128172451.792595-1-ashok.raj@xxxxxxxxx --- arch/x86/kernel/cpu/bugs.c | 1 + arch/x86/kernel/cpu/cpu.h | 2 -- arch/x86/kernel/cpu/tsx.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index bca0bd8..19e1ce0 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -33,6 +33,7 @@ #include <asm/e820/api.h> #include <asm/hypervisor.h> #include <asm/tlbflush.h> +#include <asm/cpu.h> #include "cpu.h" diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 7c9b589..57a5349 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h @@ -83,6 +83,4 @@ unsigned int aperfmperf_get_khz(int cpu); extern void x86_spec_ctrl_setup_ap(void); extern void update_srbds_msr(void); -extern u64 x86_read_arch_cap_msr(void); - #endif /* ARCH_X86_CPU_H */ diff --git a/arch/x86/kernel/cpu/tsx.c b/arch/x86/kernel/cpu/tsx.c index 8009c83..b31ee4f 100644 --- a/arch/x86/kernel/cpu/tsx.c +++ b/arch/x86/kernel/cpu/tsx.c @@ -11,6 +11,7 @@ #include <linux/cpufeature.h> #include <asm/cmdline.h> +#include <asm/cpu.h> #include "cpu.h"
|