From: Christian Borntraeger Subject: [PATCH] kvm-s390: fix memsize >=4G on linus git head Date: Mon, 21 Sep 2009 10:45:18 +0200 Message-ID: <200909211045.18487.borntraeger@de.ibm.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, Heiko Carstens , Martin Schwidefsky , Carsten Otte , Christian Ehrhardt To: Avi Kivity , Marcelo Tosatti Return-path: Received: from mtagate8-bp.emea.ibm.com ([195.212.17.168]:45538 "EHLO mtagate8.de.ibm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755018AbZIUIpR (ORCPT ); Mon, 21 Sep 2009 04:45:17 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate8.de.ibm.com (8.13.1/8.13.1) with ESMTP id n8L8jKpS013409 for ; Mon, 21 Sep 2009 08:45:20 GMT Received: from d12av04.megacenter.de.ibm.com (d12av04.megacenter.de.ibm.com [9.149.165.229]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n8L8jKTs3174426 for ; Mon, 21 Sep 2009 10:45:20 +0200 Received: from d12av04.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n8L8jJWV029074 for ; Mon, 21 Sep 2009 10:45:19 +0200 Sender: kvm-owner@vger.kernel.org List-ID: Avi, Marcelo, commit 628eb9b8a8f3ef31d8316112a4596b1a21b38159 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 --- arch/s390/kvm/kvm-s390.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6/arch/s390/kvm/kvm-s390.h =================================================================== --- linux-2.6.orig/arch/s390/kvm/kvm-s390.h +++ linux-2.6/arch/s390/kvm/kvm-s390.h @@ -58,7 +58,7 @@ int kvm_s390_inject_vcpu(struct kvm_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