Re: [PATCH 07/31] mips/kvm: Rename VCPU_registername to KVM_VCPU_ARCH_registername

[Ralf Baechle]

Acked-by: Ralf Baechle r...@linux-mips.org

  Ralf
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 07/31] mips/kvm: Rename VCPU_registername to KVM_VCPU_ARCH_registername

[David Daney]

From: David Daney david.da...@cavium.com

This makes it follow the pattern where the structure name is the
symbol name prefix.

Signed-off-by: David Daney david.da...@cavium.com
---
 arch/mips/kernel/asm-offsets.c |  68 +++---
 arch/mips/kvm/kvm_locore.S | 206 -
 2 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 22bf8f5..a0aa12c 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -351,40 +351,40 @@ void output_kvm_defines(void)
 
OFFSET(VCPU_GUEST_INST, kvm_vcpu_arch, guest_inst);
 
-   OFFSET(VCPU_R0, kvm_vcpu_arch, gprs[0]);
-   OFFSET(VCPU_R1, kvm_vcpu_arch, gprs[1]);
-   OFFSET(VCPU_R2, kvm_vcpu_arch, gprs[2]);
-   OFFSET(VCPU_R3, kvm_vcpu_arch, gprs[3]);
-   OFFSET(VCPU_R4, kvm_vcpu_arch, gprs[4]);
-   OFFSET(VCPU_R5, kvm_vcpu_arch, gprs[5]);
-   OFFSET(VCPU_R6, kvm_vcpu_arch, gprs[6]);
-   OFFSET(VCPU_R7, kvm_vcpu_arch, gprs[7]);
-   OFFSET(VCPU_R8, kvm_vcpu_arch, gprs[8]);
-   OFFSET(VCPU_R9, kvm_vcpu_arch, gprs[9]);
-   OFFSET(VCPU_R10, kvm_vcpu_arch, gprs[10]);
-   OFFSET(VCPU_R11, kvm_vcpu_arch, gprs[11]);
-   OFFSET(VCPU_R12, kvm_vcpu_arch, gprs[12]);
-   OFFSET(VCPU_R13, kvm_vcpu_arch, gprs[13]);
-   OFFSET(VCPU_R14, kvm_vcpu_arch, gprs[14]);
-   OFFSET(VCPU_R15, kvm_vcpu_arch, gprs[15]);
-   OFFSET(VCPU_R16, kvm_vcpu_arch, gprs[16]);
-   OFFSET(VCPU_R17, kvm_vcpu_arch, gprs[17]);
-   OFFSET(VCPU_R18, kvm_vcpu_arch, gprs[18]);
-   OFFSET(VCPU_R19, kvm_vcpu_arch, gprs[19]);
-   OFFSET(VCPU_R20, kvm_vcpu_arch, gprs[20]);
-   OFFSET(VCPU_R21, kvm_vcpu_arch, gprs[21]);
-   OFFSET(VCPU_R22, kvm_vcpu_arch, gprs[22]);
-   OFFSET(VCPU_R23, kvm_vcpu_arch, gprs[23]);
-   OFFSET(VCPU_R24, kvm_vcpu_arch, gprs[24]);
-   OFFSET(VCPU_R25, kvm_vcpu_arch, gprs[25]);
-   OFFSET(VCPU_R26, kvm_vcpu_arch, gprs[26]);
-   OFFSET(VCPU_R27, kvm_vcpu_arch, gprs[27]);
-   OFFSET(VCPU_R28, kvm_vcpu_arch, gprs[28]);
-   OFFSET(VCPU_R29, kvm_vcpu_arch, gprs[29]);
-   OFFSET(VCPU_R30, kvm_vcpu_arch, gprs[30]);
-   OFFSET(VCPU_R31, kvm_vcpu_arch, gprs[31]);
-   OFFSET(VCPU_LO, kvm_vcpu_arch, lo);
-   OFFSET(VCPU_HI, kvm_vcpu_arch, hi);
+   OFFSET(KVM_VCPU_ARCH_R0, kvm_vcpu_arch, gprs[0]);
+   OFFSET(KVM_VCPU_ARCH_R1, kvm_vcpu_arch, gprs[1]);
+   OFFSET(KVM_VCPU_ARCH_R2, kvm_vcpu_arch, gprs[2]);
+   OFFSET(KVM_VCPU_ARCH_R3, kvm_vcpu_arch, gprs[3]);
+   OFFSET(KVM_VCPU_ARCH_R4, kvm_vcpu_arch, gprs[4]);
+   OFFSET(KVM_VCPU_ARCH_R5, kvm_vcpu_arch, gprs[5]);
+   OFFSET(KVM_VCPU_ARCH_R6, kvm_vcpu_arch, gprs[6]);
+   OFFSET(KVM_VCPU_ARCH_R7, kvm_vcpu_arch, gprs[7]);
+   OFFSET(KVM_VCPU_ARCH_R8, kvm_vcpu_arch, gprs[8]);
+   OFFSET(KVM_VCPU_ARCH_R9, kvm_vcpu_arch, gprs[9]);
+   OFFSET(KVM_VCPU_ARCH_R10, kvm_vcpu_arch, gprs[10]);
+   OFFSET(KVM_VCPU_ARCH_R11, kvm_vcpu_arch, gprs[11]);
+   OFFSET(KVM_VCPU_ARCH_R12, kvm_vcpu_arch, gprs[12]);
+   OFFSET(KVM_VCPU_ARCH_R13, kvm_vcpu_arch, gprs[13]);
+   OFFSET(KVM_VCPU_ARCH_R14, kvm_vcpu_arch, gprs[14]);
+   OFFSET(KVM_VCPU_ARCH_R15, kvm_vcpu_arch, gprs[15]);
+   OFFSET(KVM_VCPU_ARCH_R16, kvm_vcpu_arch, gprs[16]);
+   OFFSET(KVM_VCPU_ARCH_R17, kvm_vcpu_arch, gprs[17]);
+   OFFSET(KVM_VCPU_ARCH_R18, kvm_vcpu_arch, gprs[18]);
+   OFFSET(KVM_VCPU_ARCH_R19, kvm_vcpu_arch, gprs[19]);
+   OFFSET(KVM_VCPU_ARCH_R20, kvm_vcpu_arch, gprs[20]);
+   OFFSET(KVM_VCPU_ARCH_R21, kvm_vcpu_arch, gprs[21]);
+   OFFSET(KVM_VCPU_ARCH_R22, kvm_vcpu_arch, gprs[22]);
+   OFFSET(KVM_VCPU_ARCH_R23, kvm_vcpu_arch, gprs[23]);
+   OFFSET(KVM_VCPU_ARCH_R24, kvm_vcpu_arch, gprs[24]);
+   OFFSET(KVM_VCPU_ARCH_R25, kvm_vcpu_arch, gprs[25]);
+   OFFSET(KVM_VCPU_ARCH_R26, kvm_vcpu_arch, gprs[26]);
+   OFFSET(KVM_VCPU_ARCH_R27, kvm_vcpu_arch, gprs[27]);
+   OFFSET(KVM_VCPU_ARCH_R28, kvm_vcpu_arch, gprs[28]);
+   OFFSET(KVM_VCPU_ARCH_R29, kvm_vcpu_arch, gprs[29]);
+   OFFSET(KVM_VCPU_ARCH_R30, kvm_vcpu_arch, gprs[30]);
+   OFFSET(KVM_VCPU_ARCH_R31, kvm_vcpu_arch, gprs[31]);
+   OFFSET(KVM_VCPU_ARCH_LO, kvm_vcpu_arch, lo);
+   OFFSET(KVM_VCPU_ARCH_HI, kvm_vcpu_arch, hi);
OFFSET(KVM_VCPU_ARCH_EPC, kvm_vcpu_arch, epc);
OFFSET(VCPU_COP0, kvm_vcpu_arch, cop0);
OFFSET(VCPU_GUEST_KERNEL_ASID, kvm_vcpu_arch, guest_kernel_asid);
diff --git a/arch/mips/kvm/kvm_locore.S b/arch/mips/kvm/kvm_locore.S
index a434bbe..7a33ee7 100644
--- a/arch/mips/kvm/kvm_locore.S
+++ b/arch/mips/kvm/kvm_locore.S
@@ -175,52 +175,52 @@ FEXPORT(__kvm_mips_load_asid)
 mtc0zero,  CP0_HWRENA
 
 /* Now load up the Guest Context from VCPU */
-LONG_L $1, VCPU_R1(k1)
-LONG_L $2, VCPU_R2(k1)
-LONG_L $3, VCPU_R3(k1)
-
-LONG_L