From 9d7813da847b5f8944b1ab297377f5fd6f148835 Mon Sep 17 00:00:00 2001
From: David Daney <david.daney@cavium.com>
Date: Thu, 23 May 2013 09:49:07 -0700
Subject: [PATCH] --- yaml --- r: 376601 b: refs/heads/master c:
 bf32ebf66d74e8a196256d7ac2a4f3c6938c614a h: refs/heads/master i:   376599:
 2979c52c77e09c69773cf4f868f9342ebf956058 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/mips/include/uapi/asm/kvm.h | 3 ++-
 trunk/arch/mips/kvm/kvm_mips.c         | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 14f304532bd0..498306454c77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 688cded320a4760de679160b42f9a81face02674
+refs/heads/master: bf32ebf66d74e8a196256d7ac2a4f3c6938c614a
diff --git a/trunk/arch/mips/include/uapi/asm/kvm.h b/trunk/arch/mips/include/uapi/asm/kvm.h
index 86812fb61842..d145ead16b2c 100644
--- a/trunk/arch/mips/include/uapi/asm/kvm.h
+++ b/trunk/arch/mips/include/uapi/asm/kvm.h
@@ -26,7 +26,8 @@
  * extended to 64-bits.
  */
 struct kvm_regs {
-	__u64 gprs[32];
+	/* out (KVM_GET_REGS) / in (KVM_SET_REGS) */
+	__u64 gpr[32];
 	__u64 hi;
 	__u64 lo;
 	__u64 pc;
diff --git a/trunk/arch/mips/kvm/kvm_mips.c b/trunk/arch/mips/kvm/kvm_mips.c
index e0dad0289797..93da7508c6b6 100644
--- a/trunk/arch/mips/kvm/kvm_mips.c
+++ b/trunk/arch/mips/kvm/kvm_mips.c
@@ -678,7 +678,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
 	int i;
 
 	for (i = 0; i < 32; i++)
-		vcpu->arch.gprs[i] = regs->gprs[i];
+		vcpu->arch.gprs[i] = regs->gpr[i];
 
 	vcpu->arch.hi = regs->hi;
 	vcpu->arch.lo = regs->lo;
@@ -692,7 +692,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
 	int i;
 
 	for (i = 0; i < 32; i++)
-		regs->gprs[i] = vcpu->arch.gprs[i];
+		regs->gpr[i] = vcpu->arch.gprs[i];
 
 	regs->hi = vcpu->arch.hi;
 	regs->lo = vcpu->arch.lo;