X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=arch%2Fmips%2Fkvm%2Femulate.c;h=be18dfe9ecaa210b23f6e7c1dd1f1368efd675dc;hb=8eeab81c3d55ba41ae68888b13a1a34893104e12;hp=62e6a7b313aea58c84827b1a6905aaf3125c2480;hpb=5cc4aafced42d7ece3d20650bf6ca2a165e6fca3;p=mirror_ubuntu-artful-kernel.git

diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index 62e6a7b313ae..be18dfe9ecaa 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -2357,7 +2357,9 @@ enum emulation_result kvm_mips_handle_ri(u32 cause, u32 *opc,
 	}
 
 	if (inst.r_format.opcode == spec3_op &&
-	    inst.r_format.func == rdhwr_op) {
+	    inst.r_format.func == rdhwr_op &&
+	    inst.r_format.rs == 0 &&
+	    (inst.r_format.re >> 3) == 0) {
 		int usermode = !KVM_GUEST_KERNEL_MODE(vcpu);
 		int rd = inst.r_format.rd;
 		int rt = inst.r_format.rt;