2 files changed, 8 insertions, 0 deletions

diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 41e180ed36e3..6f9338450e24 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -442,6 +442,7 @@ struct kvm_vcpu_arch {
 #define kvm_read_c0_guest_context(cop0)         (cop0->reg[MIPS_CP0_TLB_CONTEXT][0])
 #define kvm_write_c0_guest_context(cop0, val)   (cop0->reg[MIPS_CP0_TLB_CONTEXT][0] = (val))
 #define kvm_read_c0_guest_userlocal(cop0)       (cop0->reg[MIPS_CP0_TLB_CONTEXT][2])
+#define kvm_write_c0_guest_userlocal(cop0, val) (cop0->reg[MIPS_CP0_TLB_CONTEXT][2] = (val))
 #define kvm_read_c0_guest_pagemask(cop0)        (cop0->reg[MIPS_CP0_TLB_PG_MASK][0])
 #define kvm_write_c0_guest_pagemask(cop0, val)  (cop0->reg[MIPS_CP0_TLB_PG_MASK][0] = (val))
 #define kvm_read_c0_guest_wired(cop0)           (cop0->reg[MIPS_CP0_TLB_WIRED][0])
diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c
index 61d834cc35cf..26f10fb8dcba 100644
--- a/arch/mips/kvm/kvm_mips.c
+++ b/arch/mips/kvm/kvm_mips.c
@@ -526,6 +526,7 @@ static u64 kvm_mips_get_one_regs[] = {
 
         KVM_REG_MIPS_CP0_INDEX,
         KVM_REG_MIPS_CP0_CONTEXT,
+        KVM_REG_MIPS_CP0_USERLOCAL,
         KVM_REG_MIPS_CP0_PAGEMASK,
         KVM_REG_MIPS_CP0_WIRED,
         KVM_REG_MIPS_CP0_BADVADDR,
@@ -570,6 +571,9 @@ static int kvm_mips_get_reg(struct kvm_vcpu *vcpu,
         case KVM_REG_MIPS_CP0_CONTEXT:
                 v = (long)kvm_read_c0_guest_context(cop0);
                 break;
+        case KVM_REG_MIPS_CP0_USERLOCAL:
+                v = (long)kvm_read_c0_guest_userlocal(cop0);
+                break;
         case KVM_REG_MIPS_CP0_PAGEMASK:
                 v = (long)kvm_read_c0_guest_pagemask(cop0);
                 break;
@@ -678,6 +682,9 @@ static int kvm_mips_set_reg(struct kvm_vcpu *vcpu,
         case KVM_REG_MIPS_CP0_CONTEXT:
                 kvm_write_c0_guest_context(cop0, v);
                 break;
+        case KVM_REG_MIPS_CP0_USERLOCAL:
+                kvm_write_c0_guest_userlocal(cop0, v);
+                break;
         case KVM_REG_MIPS_CP0_PAGEMASK:
                 kvm_write_c0_guest_pagemask(cop0, v);
                 break;