KVM: PPC: Make DSISR 32 bits wide

DSISR is only defined as 32 bits wide. So let's reflect that in the
structs too.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 14d0262ae00bb58669bdf9c3443572698201051f..9f5a9921927e0e6e00982536fb3ba5a9f4678a70 100644 (file)
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -84,8 +84,8 @@ struct kvmppc_vcpu_book3s {
        u64 hid[6];
        u64 gqr[8];
        int slb_nr;
+       u32 dsisr;
        u64 sdr1;
-       u64 dsisr;
        u64 hior;
        u64 msr_mask;
        u64 vsid_first;

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index 119deb4750d96fd6e40387cc7736cddf2177a83c..0ebda67ad6a8bc56c89a094336038b92e5c5c617 100644 (file)
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -260,7 +260,7 @@ struct kvm_vcpu_arch {
 
        u32 last_inst;
 #ifdef CONFIG_PPC64
-       ulong fault_dsisr;
+       u32 fault_dsisr;
 #endif
        ulong fault_dear;
        ulong fault_esr;

diff --git a/arch/powerpc/kvm/book3s_64_interrupts.S b/arch/powerpc/kvm/book3s_64_interrupts.S
index c1584d0cbce82d3ca9f3dd0565d6d5adacbfc3c7..faca87610d65725177a9be21206eee303d78f095 100644 (file)
--- a/arch/powerpc/kvm/book3s_64_interrupts.S
+++ b/arch/powerpc/kvm/book3s_64_interrupts.S
@@ -171,7 +171,7 @@ kvmppc_handler_highmem:
        std     r3, VCPU_PC(r7)
        std     r4, VCPU_SHADOW_SRR1(r7)
        std     r5, VCPU_FAULT_DEAR(r7)
-       std     r6, VCPU_FAULT_DSISR(r7)
+       stw     r6, VCPU_FAULT_DSISR(r7)
 
        ld      r5, VCPU_HFLAGS(r7)
        rldicl. r5, r5, 0, 63           /* CR = ((r5 & 1) == 0) */