64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
From d2d2944b80b99ecdcb1c10b0704bbdf78fbf5f79 Mon Sep 17 00:00:00 2001
|
|
From: Ashok Raj <ashok.raj@intel.com>
|
|
Date: Mon, 28 Nov 2022 09:24:51 -0800
|
|
Subject: [PATCH 27/36] 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@intel.com>
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
Reviewed-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
|
|
Link: https://lore.kernel.org/r/20221128172451.792595-1-ashok.raj@intel.com
|
|
(cherry picked from commit bb5525a50601f8be7d0ffb04740e1714506e60c4)
|
|
Signed-off-by: Mridula Shastry <mridula.c.shastry@oracle.com>
|
|
Reviewed-by: Todd Vierling <todd.vierling@oracle.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 848a0cce2243..5dc79427d047 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 54afd004624b..1add3618f766 100644
|
|
--- a/arch/x86/kernel/cpu/cpu.h
|
|
+++ b/arch/x86/kernel/cpu/cpu.h
|
|
@@ -84,8 +84,6 @@ 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);
|
|
-
|
|
#ifdef CONFIG_IA32_FEAT_CTL
|
|
void init_ia32_feat_ctl(struct cpuinfo_x86 *c);
|
|
#endif
|
|
diff --git a/arch/x86/kernel/cpu/tsx.c b/arch/x86/kernel/cpu/tsx.c
|
|
index 39b3e65c9c8d..73b7226d042b 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"
|
|
|
|
--
|
|
2.39.3
|
|
|