Merge branch 'v3.10/topic/misc' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / arch / mips / kvm / kvm_mips_emul.c

diff --git a/arch/mips/kvm/kvm_mips_emul.c b/arch/mips/kvm/kvm_mips_emul.c
index 4b6274b47f3368b289b378703e8e9a17de5f9275..e75ef8219cafb1110478487894c9369a58d60c3a 100644 (file)
--- a/arch/mips/kvm/kvm_mips_emul.c
+++ b/arch/mips/kvm/kvm_mips_emul.c
@@ -1571,17 +1571,17 @@ kvm_mips_handle_ri(unsigned long cause, uint32_t *opc,
                        arch->gprs[rt] = kvm_read_c0_guest_userlocal(cop0);
 #else
                        /* UserLocal not implemented */
-                       er = kvm_mips_emulate_ri_exc(cause, opc, run, vcpu);
+                       er = EMULATE_FAIL;
 #endif
                        break;
 
                default:
-                       printk("RDHWR not supported\n");
+                       kvm_debug("RDHWR %#x not supported @ %p\n", rd, opc);
                        er = EMULATE_FAIL;
                        break;
                }
        } else {
-               printk("Emulate RI not supported @ %p: %#x\n", opc, inst);
+               kvm_debug("Emulate RI not supported @ %p: %#x\n", opc, inst);
                er = EMULATE_FAIL;
        }
 
@@ -1590,6 +1590,7 @@ kvm_mips_handle_ri(unsigned long cause, uint32_t *opc,
         */
        if (er == EMULATE_FAIL) {
                vcpu->arch.pc = curr_pc;
+               er = kvm_mips_emulate_ri_exc(cause, opc, run, vcpu);
        }
        return er;
 }