From bb5525a50601f8be7d0ffb04740e1714506e60c4 Mon Sep 17 00:00:00 2001 From: Ashok Raj Date: Mon, 28 Nov 2022 09:24:51 -0800 Subject: [PATCH] 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 Signed-off-by: Ingo Molnar Reviewed-by: Daniel Sneddon Link: https://lore.kernel.org/r/20221128172451.792595-1-ashok.raj@intel.com --- 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 bca0bd8f48464..19e1ce0fc17e2 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "cpu.h" diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 7c9b5893c30ab..57a5349e69548 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 8009c8346d8f8..b31ee4f1657a8 100644 --- a/arch/x86/kernel/cpu/tsx.c +++ b/arch/x86/kernel/cpu/tsx.c @@ -11,6 +11,7 @@ #include #include +#include #include "cpu.h" -- 2.30.2