diff --git a/[refs] b/[refs] index 627edb150f6b..f278754dcd80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bed1d1dfc4a458d82bcd258082638cbba860190d +refs/heads/master: 7e8e6ab48d78147f69c1ba2d6a362f8d33254468 diff --git a/trunk/arch/s390/kvm/kvm-s390.c b/trunk/arch/s390/kvm/kvm-s390.c index d3b1de83678b..d96613765973 100644 --- a/trunk/arch/s390/kvm/kvm-s390.c +++ b/trunk/arch/s390/kvm/kvm-s390.c @@ -497,7 +497,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) vcpu_put(vcpu); vcpu->stat.exit_userspace++; - return 0; + return rc; } static int __guestcopy(struct kvm_vcpu *vcpu, u64 guestdest, const void *from,