Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fix from Marcelo Tosatti: "Fix compilation on PPC with !CONFIG_KVM" * git://git.kernel.org/pub/scm/virt/kvm/kvm: Revert "KVM: allow host header to be included even for !CONFIG_KVM"
This commit is contained in:
commit
b9cb3bf42e
|
@ -1,8 +1,6 @@
|
|||
#ifndef __KVM_HOST_H
|
||||
#define __KVM_HOST_H
|
||||
|
||||
#if IS_ENABLED(CONFIG_KVM)
|
||||
|
||||
/*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2. See
|
||||
* the COPYING file in the top-level directory.
|
||||
|
@ -1057,8 +1055,5 @@ static inline bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu)
|
|||
}
|
||||
|
||||
#endif /* CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */
|
||||
#else
|
||||
static inline void __guest_enter(void) { return; }
|
||||
static inline void __guest_exit(void) { return; }
|
||||
#endif /* IS_ENABLED(CONFIG_KVM) */
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue