diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2013-03-22 12:08:06 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2013-03-22 12:08:06 +0100 |
| commit | 09a6e1f4ad32243989b30485f78985c0923284cd (patch) | |
| tree | 054ea05c79aaf29d966b9aa18c48780b5bec25ce /include | |
| parent | Merge tag 'vfio-v3.9-rc4' of git://github.com/awilliam/linux-vfio (diff) | |
| download | linux-09a6e1f4ad32243989b30485f78985c0923284cd.tar.xz linux-09a6e1f4ad32243989b30485f78985c0923284cd.zip | |
Revert "KVM: allow host header to be included even for !CONFIG_KVM"
This reverts commit f445f11eb2cc265dd47da5b2e864df46cd6e5a82 as
it breaks PPC with CONFIG_KVM=n.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
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 + |