From: Christian Borntraeger Date: Mon, 21 Sep 2009 08:45:18 +0000 (+0200) Subject: KVM: s390: fix memsize >= 4G X-Git-Tag: Ubuntu-5.0.0-8.9~25500^2~6 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8feda6f786fc44f5f8b5cf88e3b6c03514f5be93;p=mirror_ubuntu-disco-kernel.git KVM: s390: fix memsize >= 4G commit 628eb9b8a8f3 KVM: s390: streamline memslot handling introduced kvm_s390_vcpu_get_memsize. This broke guests >=4G, since this function returned an int. This patch changes the return value to a long. Signed-off-by: Christian Borntraeger Signed-off-by: Avi Kivity --- diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h index ec5eee7c25d8..06cce8285ba0 100644 --- a/arch/s390/kvm/kvm-s390.h +++ b/arch/s390/kvm/kvm-s390.h @@ -58,7 +58,7 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu, int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code); int kvm_s390_inject_sigp_stop(struct kvm_vcpu *vcpu, int action); -static inline int kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu) +static inline long kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu) { return vcpu->arch.sie_block->gmslm - vcpu->arch.sie_block->gmsor