Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / include / linux / kvm_para.h

diff --git a/include/linux/kvm_para.h b/include/linux/kvm_para.h
index ff476ddaf3103cc02e5688bc00528e7d042af891..00a97bb905db03a007450351441c823b8fa19112 100644 (file)
--- a/include/linux/kvm_para.h
+++ b/include/linux/kvm_para.h
@@ -1,31 +1,8 @@
 #ifndef __LINUX_KVM_PARA_H
 #define __LINUX_KVM_PARA_H
 
-/*
- * This header file provides a method for making a hypercall to the host
- * Architectures should define:
- * - kvm_hypercall0, kvm_hypercall1...
- * - kvm_arch_para_features
- * - kvm_para_available
- */
+#include <uapi/linux/kvm_para.h>
 
-/* Return values for hypercalls */
-#define KVM_ENOSYS             1000
-#define KVM_EFAULT             EFAULT
-#define KVM_E2BIG              E2BIG
-#define KVM_EPERM              EPERM
-
-#define KVM_HC_VAPIC_POLL_IRQ          1
-#define KVM_HC_MMU_OP                  2
-#define KVM_HC_FEATURES                        3
-#define KVM_HC_PPC_MAP_MAGIC_PAGE      4
-
-/*
- * hypercalls use architecture specific
- */
-#include <asm/kvm_para.h>
-
-#ifdef __KERNEL__
 
 static inline int kvm_para_has_feature(unsigned int feature)
 {
@@ -33,5 +10,4 @@ static inline int kvm_para_has_feature(unsigned int feature)
                return 1;
        return 0;
 }
-#endif /* __KERNEL__ */
 #endif /* __LINUX_KVM_PARA_H */