Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c4d57aa authored by Yi Wang's avatar Yi Wang Committed by Greg Kroah-Hartman
Browse files

x86/kvm/vmx: fix old-style function declaration 



[ Upstream commit 1e4329ee2c52692ea42cc677fb2133519718b34a ]

The inline keyword which is not at the beginning of the function
declaration may trigger the following build warnings, so let's fix it:

arch/x86/kvm/vmx.c:1309:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]
arch/x86/kvm/vmx.c:5947:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]
arch/x86/kvm/vmx.c:5985:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]
arch/x86/kvm/vmx.c:6023:1: warning: ‘inline’ is not at beginning of declaration [-Wold-style-declaration]

Signed-off-by: default avatarYi Wang <wang.yi59@zte.com.cn>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent eadd5357

arch/x86/kvm/vmx.c

+4 −4
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx); 
static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx);

static int alloc_identity_pagetable(struct kvm *kvm);

static void vmx_update_msr_bitmap(struct kvm_vcpu *vcpu);

static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,

static __always_inline void vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,

							  u32 msr, int type);



static DEFINE_PER_CPU(struct vmcs *, vmxarea);
@@ -4872,7 +4872,7 @@ static void free_vpid(int vpid) 
	spin_unlock(&vmx_vpid_lock);

}



static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,

static __always_inline void vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,

							  u32 msr, int type)

{

	int f = sizeof(unsigned long);
@@ -4907,7 +4907,7 @@ static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bit 
	}

}



static void __always_inline vmx_enable_intercept_for_msr(unsigned long *msr_bitmap,

static __always_inline void vmx_enable_intercept_for_msr(unsigned long *msr_bitmap,

							 u32 msr, int type)

{

	int f = sizeof(unsigned long);
@@ -4942,7 +4942,7 @@ static void __always_inline vmx_enable_intercept_for_msr(unsigned long *msr_bitm 
	}

}



static void __always_inline vmx_set_intercept_for_msr(unsigned long *msr_bitmap,

static __always_inline void vmx_set_intercept_for_msr(unsigned long *msr_bitmap,

			     			      u32 msr, int type, bool value)

{

	if (value)