Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD

Paul Mackerras writes:

    The highlights are:

    * Reduced latency for interrupts from PCI pass-through devices, from
      Suresh Warrier and me.
    * Halt-polling implementation from Suraj Jitindar Singh.
    * 64-bit VCPU statistics, also from Suraj.
    * Various other minor fixes and improvements.

1 files changed, 2 insertions, 2 deletions

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index b3fa12ce1166..a00f8e4045cf 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3619,7 +3619,7 @@ static int vm_stat_get_per_vm(void *data, u64 *val)
 {
         struct kvm_stat_data *stat_data = (struct kvm_stat_data *)data;
 
-        *val = *(u32 *)((void *)stat_data->kvm + stat_data->offset);
+        *val = *(ulong *)((void *)stat_data->kvm + stat_data->offset);
 
         return 0;
 }
@@ -3649,7 +3649,7 @@ static int vcpu_stat_get_per_vm(void *data, u64 *val)
         *val = 0;
 
         kvm_for_each_vcpu(i, vcpu, stat_data->kvm)
-                *val += *(u32 *)((void *)vcpu + stat_data->offset);
+                *val += *(u64 *)((void *)vcpu + stat_data->offset);
 
         return 0;
 }