diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2013-03-22 07:08:06 -0400 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2013-03-22 07:08:06 -0400 |
commit | 09a6e1f4ad32243989b30485f78985c0923284cd (patch) | |
tree | 054ea05c79aaf29d966b9aa18c48780b5bec25ce /include/linux/kvm_host.h | |
parent | 2ffdd7e23cde5a8b94d41ec0adfdd58cffe67f3a (diff) |
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/linux/kvm_host.h')
-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 @@ | |||
1 | #ifndef __KVM_HOST_H | 1 | #ifndef __KVM_HOST_H |
2 | #define __KVM_HOST_H | 2 | #define __KVM_HOST_H |
3 | 3 | ||
4 | #if IS_ENABLED(CONFIG_KVM) | ||
5 | |||
6 | /* | 4 | /* |
7 | * This work is licensed under the terms of the GNU GPL, version 2. See | 5 | * This work is licensed under the terms of the GNU GPL, version 2. See |
8 | * the COPYING file in the top-level directory. | 6 | * 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) | |||
1057 | } | 1055 | } |
1058 | 1056 | ||
1059 | #endif /* CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */ | 1057 | #endif /* CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */ |
1060 | #else | ||
1061 | static inline void __guest_enter(void) { return; } | ||
1062 | static inline void __guest_exit(void) { return; } | ||
1063 | #endif /* IS_ENABLED(CONFIG_KVM) */ | ||
1064 | #endif | 1058 | #endif |
1059 | |||