1 files changed, 1 insertions, 69 deletions

diff --git a/arch/powerpc/include/asm/kvm_para.h b/arch/powerpc/include/asm/kvm_para.h
index c18916bff689..9365860fb7f6 100644
--- a/arch/powerpc/include/asm/kvm_para.h
+++ b/arch/powerpc/include/asm/kvm_para.h
@@ -16,77 +16,11 @@
  *
  * Authors: Hollis Blanchard <hollisb@us.ibm.com>
  */
-
 #ifndef __POWERPC_KVM_PARA_H__
 #define __POWERPC_KVM_PARA_H__
 
-#include <linux/types.h>
+#include <uapi/asm/kvm_para.h>
 
-/*
- * Additions to this struct must only occur at the end, and should be
- * accompanied by a KVM_MAGIC_FEAT flag to advertise that they are present
- * (albeit not necessarily relevant to the current target hardware platform).
- *
- * Struct fields are always 32 or 64 bit aligned, depending on them being 32
- * or 64 bit wide respectively.
- *
- * See Documentation/virtual/kvm/ppc-pv.txt
- */
-struct kvm_vcpu_arch_shared {
-        __u64 scratch1;
-        __u64 scratch2;
-        __u64 scratch3;
-        __u64 critical;         /* Guest may not get interrupts if == r1 */
-        __u64 sprg0;
-        __u64 sprg1;
-        __u64 sprg2;
-        __u64 sprg3;
-        __u64 srr0;
-        __u64 srr1;
-        __u64 dar;              /* dear on BookE */
-        __u64 msr;
-        __u32 dsisr;
-        __u32 int_pending;      /* Tells the guest if we have an interrupt */
-        __u32 sr[16];
-        __u32 mas0;
-        __u32 mas1;
-        __u64 mas7_3;
-        __u64 mas2;
-        __u32 mas4;
-        __u32 mas6;
-        __u32 esr;
-        __u32 pir;
-
-        /*
-         * SPRG4-7 are user-readable, so we can only keep these consistent
-         * between the shared area and the real registers when there's an
-         * intervening exit to KVM.  This also applies to SPRG3 on some
-         * chips.
-         *
-         * This suffices for access by guest userspace, since in PR-mode
-         * KVM, an exit must occur when changing the guest's MSR[PR].
-         * If the guest kernel writes to SPRG3-7 via the shared area, it
-         * must also use the shared area for reading while in kernel space.
-         */
-        __u64 sprg4;
-        __u64 sprg5;
-        __u64 sprg6;
-        __u64 sprg7;
-};
-
-#define KVM_SC_MAGIC_R0         0x4b564d21 /* "KVM!" */
-#define HC_VENDOR_KVM           (42 << 16)
-#define HC_EV_SUCCESS           0
-#define HC_EV_UNIMPLEMENTED     12
-
-#define KVM_FEATURE_MAGIC_PAGE  1
-
-#define KVM_MAGIC_FEAT_SR               (1 << 0)
-
-/* MASn, ESR, PIR, and high SPRGs */
-#define KVM_MAGIC_FEAT_MAS0_TO_SPRG7    (1 << 1)
-
-#ifdef __KERNEL__
 
 #ifdef CONFIG_KVM_GUEST
 
@@ -211,6 +145,4 @@ static inline bool kvm_check_and_clear_guest_paused(void)
         return false;
 }
 
-#endif /* __KERNEL__ */
-
 #endif /* __POWERPC_KVM_PARA_H__ */