Commit 33e19115 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

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



As requested by Andrew. Same as what sparc did.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 19cdd08b

arch/s390/include/asm/types.h

+1 −5
Original line number Diff line number Diff line
@@ -9,11 +9,7 @@ 
#ifndef _S390_TYPES_H

#define _S390_TYPES_H



#ifndef __s390x__

#include <asm-generic/int-ll64.h>

#else

# include <asm-generic/int-l64.h>

#endif



#ifndef __ASSEMBLY__

arch/s390/kvm/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

arch/s390/kvm/interrupt.c

+3 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu, 
		break;



	case KVM_S390_INT_VIRTIO:

		VCPU_EVENT(vcpu, 4, "interrupt: virtio parm:%x,parm64:%lx",

		VCPU_EVENT(vcpu, 4, "interrupt: virtio parm:%x,parm64:%llx",

			   inti->ext.ext_params, inti->ext.ext_params2);

		vcpu->stat.deliver_virtio_interrupt++;

		rc = put_guest_u16(vcpu, __LC_EXT_INT_CODE, 0x2603);
@@ -360,7 +360,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) 
	vcpu->arch.ckc_timer.expires = jiffies + sltime;



	add_timer(&vcpu->arch.ckc_timer);

	VCPU_EVENT(vcpu, 5, "enabled wait timer:%lx jiffies", sltime);

	VCPU_EVENT(vcpu, 5, "enabled wait timer:%llx jiffies", sltime);

no_timer:

	spin_lock_bh(&vcpu->arch.local_int.float_int->lock);

	spin_lock_bh(&vcpu->arch.local_int.lock);
@@ -491,7 +491,7 @@ int kvm_s390_inject_vm(struct kvm *kvm, 


	switch (s390int->type) {

	case KVM_S390_INT_VIRTIO:

		VM_EVENT(kvm, 5, "inject: virtio parm:%x,parm64:%lx",

		VM_EVENT(kvm, 5, "inject: virtio parm:%x,parm64:%llx",

			 s390int->parm, s390int->parm64);

		inti->type = s390int->type;

		inti->ext.ext_params = s390int->parm;

arch/s390/kvm/priv.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu) 
		goto out;

	}



	VCPU_EVENT(vcpu, 5, "storing cpu address to %lx", useraddr);

	VCPU_EVENT(vcpu, 5, "storing cpu address to %llx", useraddr);

out:

	return 0;

}