4 files changed, 14 insertions, 58 deletions

diff --git a/arch/powerpc/kvm/book3s_exports.c b/arch/powerpc/kvm/book3s_exports.c
index 852989a9bad3..20d4ea8e656d 100644
--- a/arch/powerpc/kvm/book3s_exports.c
+++ b/arch/powerpc/kvm/book3s_exports.c
@@ -25,9 +25,5 @@ EXPORT_SYMBOL_GPL(kvmppc_hv_entry_trampoline);
 #endif
 #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
 EXPORT_SYMBOL_GPL(kvmppc_entry_trampoline);
-EXPORT_SYMBOL_GPL(kvmppc_load_up_fpu);
-#ifdef CONFIG_ALTIVEC
-EXPORT_SYMBOL_GPL(kvmppc_load_up_altivec);
-#endif
 #endif
 
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 21bf7c5c9545..d63a91f825d3 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -691,7 +691,8 @@ static int kvmppc_handle_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr,
 #endif
                 t->fp_state.fpscr = vcpu->arch.fpscr;
                 t->fpexc_mode = 0;
-                kvmppc_load_up_fpu();
+                enable_kernel_fp();
+                load_fp_state(&t->fp_state);
         }
 
         if (msr & MSR_VEC) {
@@ -699,7 +700,8 @@ static int kvmppc_handle_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr,
                 memcpy(t->vr_state.vr, vcpu->arch.vr, sizeof(vcpu->arch.vr));
                 t->vr_state.vscr = vcpu->arch.vscr;
                 t->vrsave = -1;
-                kvmppc_load_up_altivec();
+                enable_kernel_altivec();
+                load_vr_state(&t->vr_state);
 #endif
         }
 
@@ -722,11 +724,15 @@ static void kvmppc_handle_lost_ext(struct kvm_vcpu *vcpu)
         if (!lost_ext)
                 return;
 
-        if (lost_ext & MSR_FP)
-                kvmppc_load_up_fpu();
+        if (lost_ext & MSR_FP) {
+                enable_kernel_fp();
+                load_fp_state(&current->thread.fp_state);
+        }
 #ifdef CONFIG_ALTIVEC
-        if (lost_ext & MSR_VEC)
-                kvmppc_load_up_altivec();
+        if (lost_ext & MSR_VEC) {
+                enable_kernel_altivec();
+                load_vr_state(&current->thread.vr_state);
+        }
 #endif
         current->thread.regs->msr |= lost_ext;
 }
diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index a38c4c9edab8..c78ffbc371a5 100644
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -166,51 +166,4 @@ _GLOBAL(kvmppc_entry_trampoline)
         mtsrr1  r6
         RFI
 
-#if defined(CONFIG_PPC_BOOK3S_32)
-#define STACK_LR        INT_FRAME_SIZE+4
-
-/* load_up_xxx have to run with MSR_DR=0 on Book3S_32 */
-#define MSR_EXT_START                                           \
-        PPC_STL r20, _NIP(r1);                                  \
-        mfmsr   r20;                                            \
-        LOAD_REG_IMMEDIATE(r3, MSR_DR|MSR_EE);                  \
-        andc    r3,r20,r3;              /* Disable DR,EE */     \
-        mtmsr   r3;                                             \
-        sync
-
-#define MSR_EXT_END                                             \
-        mtmsr   r20;                    /* Enable DR,EE */      \
-        sync;                                                   \
-        PPC_LL  r20, _NIP(r1)
-
-#elif defined(CONFIG_PPC_BOOK3S_64)
-#define STACK_LR        _LINK
-#define MSR_EXT_START
-#define MSR_EXT_END
-#endif
-
-/*
- * Activate current's external feature (FPU/Altivec/VSX)
- */
-#define define_load_up(what)                                    \
-                                                                \
-_GLOBAL(kvmppc_load_up_ ## what);                               \
-        PPC_STLU r1, -INT_FRAME_SIZE(r1);                       \
-        mflr    r3;                                             \
-        PPC_STL r3, STACK_LR(r1);                               \
-        MSR_EXT_START;                                          \
-                                                                \
-        bl      FUNC(load_up_ ## what);                         \
-                                                                \
-        MSR_EXT_END;                                            \
-        PPC_LL  r3, STACK_LR(r1);                               \
-        mtlr    r3;                                             \
-        addi    r1, r1, INT_FRAME_SIZE;                         \
-        blr
-
-define_load_up(fpu)
-#ifdef CONFIG_ALTIVEC
-define_load_up(altivec)
-#endif
-
 #include "book3s_segment.S"
diff --git a/arch/powerpc/kvm/booke.h b/arch/powerpc/kvm/booke.h
index 09bfd9bc7cf8..fe59f225327f 100644
--- a/arch/powerpc/kvm/booke.h
+++ b/arch/powerpc/kvm/booke.h
@@ -136,7 +136,8 @@ static inline void kvmppc_load_guest_fp(struct kvm_vcpu *vcpu)
 {
 #ifdef CONFIG_PPC_FPU
         if (vcpu->fpu_active && !(current->thread.regs->msr & MSR_FP)) {
-                load_up_fpu();
+                enable_kernel_fp();
+                load_fp_state(&current->thread.fp_state);
                 current->thread.regs->msr |= MSR_FP;
         }
 #endif