2 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 78c0885d6501..126c90d18387 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -443,7 +443,7 @@ int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
         struct coproc_params params;
 
-        params.CRm = (kvm_vcpu_get_hsr(vcpu) >> 1) & 0xf;
+        params.CRn = (kvm_vcpu_get_hsr(vcpu) >> 1) & 0xf;
         params.Rt1 = (kvm_vcpu_get_hsr(vcpu) >> 5) & 0xf;
         params.is_write = ((kvm_vcpu_get_hsr(vcpu) & 1) == 0);
         params.is_64bit = true;
@@ -451,7 +451,7 @@ int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run)
         params.Op1 = (kvm_vcpu_get_hsr(vcpu) >> 16) & 0xf;
         params.Op2 = 0;
         params.Rt2 = (kvm_vcpu_get_hsr(vcpu) >> 10) & 0xf;
-        params.CRn = 0;
+        params.CRm = 0;
 
         return emulate_cp15(vcpu, &params);
 }
diff --git a/arch/arm/kvm/coproc.h b/arch/arm/kvm/coproc.h
index 0461d5c8d3de..c5ad7ff40c96 100644
--- a/arch/arm/kvm/coproc.h
+++ b/arch/arm/kvm/coproc.h
@@ -58,8 +58,8 @@ static inline void print_cp_instr(const struct coproc_params *p)
 {
         /* Look, we even formatted it for you to paste into the table! */
         if (p->is_64bit) {
-                kvm_pr_unimpl(" { CRm(%2lu), Op1(%2lu), is64, func_%s },\n",
-                              p->CRm, p->Op1, p->is_write ? "write" : "read");
+                kvm_pr_unimpl(" { CRm64(%2lu), Op1(%2lu), is64, func_%s },\n",
+                              p->CRn, p->Op1, p->is_write ? "write" : "read");
         } else {
                 kvm_pr_unimpl(" { CRn(%2lu), CRm(%2lu), Op1(%2lu), Op2(%2lu), is32,"
                               " func_%s },\n",