From bbbde91e61fe895f9f4d11ac38d1641a974d64c9 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 21 Sep 2009 10:45:18 +0200 Subject: [PATCH] --- yaml --- r: 166920 b: refs/heads/master c: 8feda6f786fc44f5f8b5cf88e3b6c03514f5be93 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kvm/kvm-s390.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bb4ccee09baf..ee3cb6d9a89b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20824f30bb0b8ae0a4099895fd4509f54cf2e1e2 +refs/heads/master: 8feda6f786fc44f5f8b5cf88e3b6c03514f5be93 diff --git a/trunk/arch/s390/kvm/kvm-s390.h b/trunk/arch/s390/kvm/kvm-s390.h index ec5eee7c25d8..06cce8285ba0 100644 --- a/trunk/arch/s390/kvm/kvm-s390.h +++ b/trunk/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