[S390] Use unsigned long long for u64 on 64bit.

[linux-2.6-omap-h63xx.git] / arch / s390 / kvm / diag.c

diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index f639a152869fab72c1c2eff9fd2a2f4df2e65fc8..8300309698fa3abce3b9b84a5884aba432c372fe 100644 (file)
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -20,7 +20,7 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu)
        VCPU_EVENT(vcpu, 5, "%s", "diag time slice end");
        vcpu->stat.diagnose_44++;
        vcpu_put(vcpu);
-       schedule();
+       yield();
        vcpu_load(vcpu);
        return 0;
 }
@@ -47,7 +47,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu)
        vcpu->run->s390_reset_flags |= KVM_S390_RESET_IPL;
        vcpu->run->s390_reset_flags |= KVM_S390_RESET_CPU_INIT;
        vcpu->run->exit_reason = KVM_EXIT_S390_RESET;
-       VCPU_EVENT(vcpu, 3, "requesting userspace resets %lx",
+       VCPU_EVENT(vcpu, 3, "requesting userspace resets %llx",
          vcpu->run->s390_reset_flags);
        return -EREMOTE;
 }