kvm/powerpc: rename kvm_hypercall() to epapr_hypercall()

kvm_hypercall() have nothing KVM specific, so renamed to epapr_hypercall().
Also this in moved to arch/powerpc/include/asm/epapr_hcalls.h

Signed-off-by: Bharat Bhushan <bharat.bhushan@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 2 insertions, 39 deletions

diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c
index db28032e320e..6a0175297b0d 100644
--- a/arch/powerpc/kernel/kvm.c
+++ b/arch/powerpc/kernel/kvm.c
@@ -413,13 +413,13 @@ static void kvm_map_magic_page(void *data)
 {
         u32 *features = data;
 
-        ulong in[8];
+        ulong in[8] = {0};
         ulong out[8];
 
         in[0] = KVM_MAGIC_PAGE;
         in[1] = KVM_MAGIC_PAGE;
 
-        kvm_hypercall(in, out, KVM_HCALL_TOKEN(KVM_HC_PPC_MAP_MAGIC_PAGE));
+        epapr_hypercall(in, out, KVM_HCALL_TOKEN(KVM_HC_PPC_MAP_MAGIC_PAGE));
 
         *features = out[0];
 }
@@ -711,43 +711,6 @@ static void kvm_use_magic_page(void)
                          kvm_patching_worked ? "worked" : "failed");
 }
 
-unsigned long kvm_hypercall(unsigned long *in,
-                            unsigned long *out,
-                            unsigned long nr)
-{
-        unsigned long register r0 asm("r0");
-        unsigned long register r3 asm("r3") = in[0];
-        unsigned long register r4 asm("r4") = in[1];
-        unsigned long register r5 asm("r5") = in[2];
-        unsigned long register r6 asm("r6") = in[3];
-        unsigned long register r7 asm("r7") = in[4];
-        unsigned long register r8 asm("r8") = in[5];
-        unsigned long register r9 asm("r9") = in[6];
-        unsigned long register r10 asm("r10") = in[7];
-        unsigned long register r11 asm("r11") = nr;
-        unsigned long register r12 asm("r12");
-
-        asm volatile("bl        epapr_hypercall_start"
-                     : "=r"(r0), "=r"(r3), "=r"(r4), "=r"(r5), "=r"(r6),
-                       "=r"(r7), "=r"(r8), "=r"(r9), "=r"(r10), "=r"(r11),
-                       "=r"(r12)
-                     : "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7), "r"(r8),
-                       "r"(r9), "r"(r10), "r"(r11)
-                     : "memory", "cc", "xer", "ctr", "lr");
-
-        out[0] = r4;
-        out[1] = r5;
-        out[2] = r6;
-        out[3] = r7;
-        out[4] = r8;
-        out[5] = r9;
-        out[6] = r10;
-        out[7] = r11;
-
-        return r3;
-}
-EXPORT_SYMBOL_GPL(kvm_hypercall);
-
 static __init void kvm_free_tmp(void)
 {
         free_reserved_area(&kvm_tmp[kvm_tmp_index],