Commit b10c307f authored by Benjamin Thiel's avatar Benjamin Thiel Committed by Borislav Petkov
Browse files

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: default avatarBenjamin Thiel <b.thiel@posteo.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: kvm@vger.kernel.org
Link: https://lkml.kernel.org/r/20200123172945.7235-1-b.thiel@posteo.de
parent 99ce3255

arch/x86/include/asm/mwait.h

+2 −0
Original line number Diff line number Diff line
@@ -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)

{

arch/x86/kernel/cpu/umwait.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/cpu.h>



#include <asm/msr.h>

#include <asm/mwait.h>



#define UMWAIT_C02_ENABLE	0

arch/x86/kvm/vmx/vmx.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/x86/kvm/vmx/vmx.h

+0 −2
Original line number Diff line number Diff line
@@ -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