From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: KVM guest: fix build with CONFIG_KVM_GUEST=n Date: Tue, 19 Jul 2011 12:46:22 -0300 Message-ID: <20110719154622.GA32249@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Randy Dunlap To: kvm Return-path: Received: from mx1.redhat.com ([209.132.183.28]:48122 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751745Ab1GSPqc (ORCPT ); Tue, 19 Jul 2011 11:46:32 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: Fix build with CONFIG_KVM_GUEST=n. Signed-off-by: Marcelo Tosatti diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index 35d732d..734c376 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -94,7 +94,6 @@ struct kvm_vcpu_pv_apf_data { extern void kvmclock_init(void); extern int kvm_register_clock(char *txt); -extern void kvm_disable_steal_time(void); /* This instruction is vmcall. On non-VT architectures, it will generate a @@ -193,6 +192,7 @@ void __init kvm_guest_init(void); void kvm_async_pf_task_wait(u32 token); void kvm_async_pf_task_wake(u32 token); u32 kvm_read_and_reset_pf_reason(void); +extern void kvm_disable_steal_time(void); #else #define kvm_guest_init() do { } while (0) #define kvm_async_pf_task_wait(T) do {} while(0) @@ -201,6 +201,11 @@ static inline u32 kvm_read_and_reset_pf_reason(void) { return 0; } + +static inline void kvm_disable_steal_time(void) +{ + return; +} #endif #endif /* __KERNEL__ */