1 files changed, 7 insertions, 5 deletions

diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index 751cd45f65a0..2f9a0873b44f 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -130,8 +130,8 @@ static int kvmppc_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
         case SPRN_PIR: break;
 
         default:
-                emulated = kvmppc_core_emulate_mtspr(vcpu, sprn,
-                                                     spr_val);
+                emulated = vcpu->kvm->arch.kvm_ops->emulate_mtspr(vcpu, sprn,
+                                                                  spr_val);
                 if (emulated == EMULATE_FAIL)
                         printk(KERN_INFO "mtspr: unknown spr "
                                 "0x%x\n", sprn);
@@ -191,8 +191,8 @@ static int kvmppc_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                 spr_val = kvmppc_get_dec(vcpu, get_tb());
                 break;
         default:
-                emulated = kvmppc_core_emulate_mfspr(vcpu, sprn,
-                                                     &spr_val);
+                emulated = vcpu->kvm->arch.kvm_ops->emulate_mfspr(vcpu, sprn,
+                                                                  &spr_val);
                 if (unlikely(emulated == EMULATE_FAIL)) {
                         printk(KERN_INFO "mfspr: unknown spr "
                                 "0x%x\n", sprn);
@@ -464,7 +464,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
         }
 
         if (emulated == EMULATE_FAIL) {
-                emulated = kvmppc_core_emulate_op(run, vcpu, inst, &advance);
+                emulated = vcpu->kvm->arch.kvm_ops->emulate_op(run, vcpu, inst,
+                                                               &advance);
                 if (emulated == EMULATE_AGAIN) {
                         advance = 0;
                 } else if (emulated == EMULATE_FAIL) {
@@ -483,3 +484,4 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 
         return emulated;
 }
+EXPORT_SYMBOL_GPL(kvmppc_emulate_instruction);