Messages in this thread | | | Date | Tue, 29 Nov 2022 10:41:16 -0700 | Subject | Re: [PATCH] x86/cpu: Remove redundant extern x86_read_arch_cap_msr() | From | Daniel Sneddon <> |
| |
On 11/28/22 10:24, Ashok Raj wrote: > x86_read_arch_cap_msr() has now moved to arch/x86/include/asm/cpu.h. > Kill the redundant one in arch/x86/kernel/cpu.h > > Signed-off-by: Ashok Raj <ashok.raj@intel.com> > --- > arch/x86/kernel/cpu/cpu.h | 2 -- > arch/x86/kernel/cpu/bugs.c | 1 + > arch/x86/kernel/cpu/tsx.c | 1 + > 3 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h > index a142b8d543a3..727ef3268ffb 100644 > --- a/arch/x86/kernel/cpu/cpu.h > +++ b/arch/x86/kernel/cpu/cpu.h > @@ -82,6 +82,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/bugs.c b/arch/x86/kernel/cpu/bugs.c > index 3e3230cccaa7..a632fa07e93a 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/tsx.c b/arch/x86/kernel/cpu/tsx.c > index ec7bbac3a9f2..667b25936818 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" >
Reviewed-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
| |