* [PATCH v2] x86/cpu: Move prototype for get_umwait_control_msr() to global location
@ 2020-01-23 17:29 Benjamin Thiel
2020-02-17 18:38 ` [tip: x86/cleanups] x86/cpu: Move prototype for get_umwait_control_msr() to a " tip-bot2 for Benjamin Thiel
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Thiel @ 2020-01-23 17:29 UTC (permalink / raw)
To: kvm; +Cc: X86 ML, LKML, Sean Christopherson, Benjamin Thiel
.. in order to fix a -Wmissing-prototype warning.
No functional change.
Signed-off-by: Benjamin Thiel <b.thiel@posteo.de>
---
arch/x86/include/asm/mwait.h | 2 ++
arch/x86/kernel/cpu/umwait.c | 1 +
arch/x86/kvm/vmx/vmx.c | 1 +
arch/x86/kvm/vmx/vmx.h | 2 --
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h
index 9d5252c9685c..b809f117f3f4 100644
--- a/arch/x86/include/asm/mwait.h
+++ b/arch/x86/include/asm/mwait.h
@@ -23,6 +23,8 @@
#define MWAITX_MAX_LOOPS ((u32)-1)
#define MWAITX_DISABLE_CSTATES 0xf0
+u32 get_umwait_control_msr(void);
+
static inline void __monitor(const void *eax, unsigned long ecx,
unsigned long edx)
{
diff --git a/arch/x86/kernel/cpu/umwait.c b/arch/x86/kernel/cpu/umwait.c
index c222f283b456..300e3fd5ade3 100644
--- a/arch/x86/kernel/cpu/umwait.c
+++ b/arch/x86/kernel/cpu/umwait.c
@@ -4,6 +4,7 @@
#include <linux/cpu.h>
#include <asm/msr.h>
+#include <asm/mwait.h>
#define UMWAIT_C02_ENABLE 0
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index e3394c839dea..11cd0242479b 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -41,6 +41,7 @@
#include <asm/mce.h>
#include <asm/mmu_context.h>
#include <asm/mshyperv.h>
+#include <asm/mwait.h>
#include <asm/spec-ctrl.h>
#include <asm/virtext.h>
#include <asm/vmx.h>
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index a4f7f737c5d4..db947076bf68 100644
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -14,8 +14,6 @@
extern const u32 vmx_msr_index[];
extern u64 host_efer;
-extern u32 get_umwait_control_msr(void);
-
#define MSR_TYPE_R 1
#define MSR_TYPE_W 2
#define MSR_TYPE_RW 3
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/cleanups] x86/cpu: Move prototype for get_umwait_control_msr() to a global location
2020-01-23 17:29 [PATCH v2] x86/cpu: Move prototype for get_umwait_control_msr() to global location Benjamin Thiel
@ 2020-02-17 18:38 ` tip-bot2 for Benjamin Thiel
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Benjamin Thiel @ 2020-02-17 18:38 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Benjamin Thiel, Borislav Petkov, kvm, x86, LKML
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: b10c307f6f314c068814d0e23c86f06d5d57004b
Gitweb: https://git.kernel.org/tip/b10c307f6f314c068814d0e23c86f06d5d57004b
Author: Benjamin Thiel <b.thiel@posteo.de>
AuthorDate: Thu, 23 Jan 2020 18:29:45 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 17 Feb 2020 19:32:45 +01:00
x86/cpu: Move prototype for get_umwait_control_msr() to a global location
.. in order to fix a -Wmissing-prototypes warning.
No functional change.
Signed-off-by: Benjamin Thiel <b.thiel@posteo.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: kvm@vger.kernel.org
Link: https://lkml.kernel.org/r/20200123172945.7235-1-b.thiel@posteo.de
---
arch/x86/include/asm/mwait.h | 2 ++
arch/x86/kernel/cpu/umwait.c | 1 +
arch/x86/kvm/vmx/vmx.c | 1 +
arch/x86/kvm/vmx/vmx.h | 2 --
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h
index 9d5252c..b809f11 100644
--- a/arch/x86/include/asm/mwait.h
+++ b/arch/x86/include/asm/mwait.h
@@ -23,6 +23,8 @@
#define MWAITX_MAX_LOOPS ((u32)-1)
#define MWAITX_DISABLE_CSTATES 0xf0
+u32 get_umwait_control_msr(void);
+
static inline void __monitor(const void *eax, unsigned long ecx,
unsigned long edx)
{
diff --git a/arch/x86/kernel/cpu/umwait.c b/arch/x86/kernel/cpu/umwait.c
index c222f28..300e3fd 100644
--- a/arch/x86/kernel/cpu/umwait.c
+++ b/arch/x86/kernel/cpu/umwait.c
@@ -4,6 +4,7 @@
#include <linux/cpu.h>
#include <asm/msr.h>
+#include <asm/mwait.h>
#define UMWAIT_C02_ENABLE 0
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 9a66648..2068cda 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -41,6 +41,7 @@
#include <asm/mce.h>
#include <asm/mmu_context.h>
#include <asm/mshyperv.h>
+#include <asm/mwait.h>
#include <asm/spec-ctrl.h>
#include <asm/virtext.h>
#include <asm/vmx.h>
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index 7f42cf3..b4e14ed 100644
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -14,8 +14,6 @@
extern const u32 vmx_msr_index[];
extern u64 host_efer;
-extern u32 get_umwait_control_msr(void);
-
#define MSR_TYPE_R 1
#define MSR_TYPE_W 2
#define MSR_TYPE_RW 3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-17 18:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-23 17:29 [PATCH v2] x86/cpu: Move prototype for get_umwait_control_msr() to global location Benjamin Thiel
2020-02-17 18:38 ` [tip: x86/cleanups] x86/cpu: Move prototype for get_umwait_control_msr() to a " tip-bot2 for Benjamin Thiel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).