xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/cpu: Move prototype for get_umwait_control_msr() to a global location

Browse Source 
.. 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
This commit is contained in:
Benjamin Thiel
2020-01-23 18:29:45 +01:00
committed by Borislav Petkov
parent 99ce3255fd
commit b10c307f6f
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/mwait.h
View File

@@ -23,6 +23,8 @@
#define MWAITX_MAX_LOOPS ((u32)-1) #define MWAITX_MAX_LOOPS ((u32)-1)
#define MWAITX_DISABLE_CSTATES 0xf0 #define MWAITX_DISABLE_CSTATES 0xf0
u32 get_umwait_control_msr(void);
static inline void __monitor(const void *eax, unsigned long ecx, static inline void __monitor(const void *eax, unsigned long ecx,
unsigned long edx) unsigned long edx)
{ {

1
arch/x86/kernel/cpu/umwait.c
View File

@@ -4,6 +4,7 @@
#include <linux/cpu.h> #include <linux/cpu.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/mwait.h>
#define UMWAIT_C02_ENABLE 0 #define UMWAIT_C02_ENABLE 0

1
arch/x86/kvm/vmx/vmx.c
View File

@@ -41,6 +41,7 @@
#include <asm/mce.h> #include <asm/mce.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/mshyperv.h> #include <asm/mshyperv.h>
#include <asm/mwait.h>
#include <asm/spec-ctrl.h> #include <asm/spec-ctrl.h>
#include <asm/virtext.h> #include <asm/virtext.h>
#include <asm/vmx.h> #include <asm/vmx.h>

2
arch/x86/kvm/vmx/vmx.h
View File

@@ -14,8 +14,6 @@
extern const u32 vmx_msr_index[]; extern const u32 vmx_msr_index[];
extern u64 host_efer; extern u64 host_efer;
extern u32 get_umwait_control_msr(void);
#define MSR_TYPE_R 1 #define MSR_TYPE_R 1
#define MSR_TYPE_W 2 #define MSR_TYPE_W 2
#define MSR_TYPE_RW 3 #define MSR_TYPE_RW 3