Skip to content

Commit bb5525a

Browse files
ashok-rajIngo Molnar
authored andcommitted
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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Reviewed-by: Daniel Sneddon <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent b7bfaa7 commit bb5525a

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

arch/x86/kernel/cpu/bugs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <asm/e820/api.h>
3434
#include <asm/hypervisor.h>
3535
#include <asm/tlbflush.h>
36+
#include <asm/cpu.h>
3637

3738
#include "cpu.h"
3839

arch/x86/kernel/cpu/cpu.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,4 @@ unsigned int aperfmperf_get_khz(int cpu);
8383
extern void x86_spec_ctrl_setup_ap(void);
8484
extern void update_srbds_msr(void);
8585

86-
extern u64 x86_read_arch_cap_msr(void);
87-
8886
#endif /* ARCH_X86_CPU_H */

arch/x86/kernel/cpu/tsx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/cpufeature.h>
1212

1313
#include <asm/cmdline.h>
14+
#include <asm/cpu.h>
1415

1516
#include "cpu.h"
1617

0 commit comments

Comments
 (0)