diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/types.h | 6 | ||||
-rw-r--r-- | arch/s390/kvm/diag.c | 2 | ||||
-rw-r--r-- | arch/s390/kvm/interrupt.c | 6 | ||||
-rw-r--r-- | arch/s390/kvm/priv.c | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/arch/s390/include/asm/types.h b/arch/s390/include/asm/types.h index 41c547656130..3dc3fc228812 100644 --- a/arch/s390/include/asm/types.h +++ b/arch/s390/include/asm/types.h | |||
@@ -9,11 +9,7 @@ | |||
9 | #ifndef _S390_TYPES_H | 9 | #ifndef _S390_TYPES_H |
10 | #define _S390_TYPES_H | 10 | #define _S390_TYPES_H |
11 | 11 | ||
12 | #ifndef __s390x__ | 12 | #include <asm-generic/int-ll64.h> |
13 | # include <asm-generic/int-ll64.h> | ||
14 | #else | ||
15 | # include <asm-generic/int-l64.h> | ||
16 | #endif | ||
17 | 13 | ||
18 | #ifndef __ASSEMBLY__ | 14 | #ifndef __ASSEMBLY__ |
19 | 15 | ||
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index a0775e1f08df..8300309698fa 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c | |||
@@ -47,7 +47,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu) | |||
47 | vcpu->run->s390_reset_flags |= KVM_S390_RESET_IPL; | 47 | vcpu->run->s390_reset_flags |= KVM_S390_RESET_IPL; |
48 | vcpu->run->s390_reset_flags |= KVM_S390_RESET_CPU_INIT; | 48 | vcpu->run->s390_reset_flags |= KVM_S390_RESET_CPU_INIT; |
49 | vcpu->run->exit_reason = KVM_EXIT_S390_RESET; | 49 | vcpu->run->exit_reason = KVM_EXIT_S390_RESET; |
50 | VCPU_EVENT(vcpu, 3, "requesting userspace resets %lx", | 50 | VCPU_EVENT(vcpu, 3, "requesting userspace resets %llx", |
51 | vcpu->run->s390_reset_flags); | 51 | vcpu->run->s390_reset_flags); |
52 | return -EREMOTE; | 52 | return -EREMOTE; |
53 | } | 53 | } |
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 2960702b4824..f4fe28a2521a 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c | |||
@@ -160,7 +160,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu, | |||
160 | break; | 160 | break; |
161 | 161 | ||
162 | case KVM_S390_INT_VIRTIO: | 162 | case KVM_S390_INT_VIRTIO: |
163 | VCPU_EVENT(vcpu, 4, "interrupt: virtio parm:%x,parm64:%lx", | 163 | VCPU_EVENT(vcpu, 4, "interrupt: virtio parm:%x,parm64:%llx", |
164 | inti->ext.ext_params, inti->ext.ext_params2); | 164 | inti->ext.ext_params, inti->ext.ext_params2); |
165 | vcpu->stat.deliver_virtio_interrupt++; | 165 | vcpu->stat.deliver_virtio_interrupt++; |
166 | rc = put_guest_u16(vcpu, __LC_EXT_INT_CODE, 0x2603); | 166 | rc = put_guest_u16(vcpu, __LC_EXT_INT_CODE, 0x2603); |
@@ -360,7 +360,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) | |||
360 | vcpu->arch.ckc_timer.expires = jiffies + sltime; | 360 | vcpu->arch.ckc_timer.expires = jiffies + sltime; |
361 | 361 | ||
362 | add_timer(&vcpu->arch.ckc_timer); | 362 | add_timer(&vcpu->arch.ckc_timer); |
363 | VCPU_EVENT(vcpu, 5, "enabled wait timer:%lx jiffies", sltime); | 363 | VCPU_EVENT(vcpu, 5, "enabled wait timer:%llx jiffies", sltime); |
364 | no_timer: | 364 | no_timer: |
365 | spin_lock_bh(&vcpu->arch.local_int.float_int->lock); | 365 | spin_lock_bh(&vcpu->arch.local_int.float_int->lock); |
366 | spin_lock_bh(&vcpu->arch.local_int.lock); | 366 | spin_lock_bh(&vcpu->arch.local_int.lock); |
@@ -491,7 +491,7 @@ int kvm_s390_inject_vm(struct kvm *kvm, | |||
491 | 491 | ||
492 | switch (s390int->type) { | 492 | switch (s390int->type) { |
493 | case KVM_S390_INT_VIRTIO: | 493 | case KVM_S390_INT_VIRTIO: |
494 | VM_EVENT(kvm, 5, "inject: virtio parm:%x,parm64:%lx", | 494 | VM_EVENT(kvm, 5, "inject: virtio parm:%x,parm64:%llx", |
495 | s390int->parm, s390int->parm64); | 495 | s390int->parm, s390int->parm64); |
496 | inti->type = s390int->type; | 496 | inti->type = s390int->type; |
497 | inti->ext.ext_params = s390int->parm; | 497 | inti->ext.ext_params = s390int->parm; |
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index cce40ff2913b..3605df45dd41 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c | |||
@@ -118,7 +118,7 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu) | |||
118 | goto out; | 118 | goto out; |
119 | } | 119 | } |
120 | 120 | ||
121 | VCPU_EVENT(vcpu, 5, "storing cpu address to %lx", useraddr); | 121 | VCPU_EVENT(vcpu, 5, "storing cpu address to %llx", useraddr); |
122 | out: | 122 | out: |
123 | return 0; | 123 | return 0; |
124 | } | 124 | } |