diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-22 20:57:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-22 20:57:30 +0100 |
| commit | b9cb3bf42efc2faa55e815f4368738978536c6d1 (patch) | |
| tree | d17b9aa7132313423d9c1d53695bbeead35fa00e /include | |
| parent | Merge tag 'usb-3.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| parent | Revert "KVM: allow host header to be included even for !CONFIG_KVM" (diff) | |
| download | linux-b9cb3bf42efc2faa55e815f4368738978536c6d1.tar.xz linux-b9cb3bf42efc2faa55e815f4368738978536c6d1.zip | |
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"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/kvm_host.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index a9428635c9fd..cad77fe09d77 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -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 + |