Merge commit 'upstream/master'

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

diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
index 0a236acfb5f6f472226845684697e77732ee1a75..5a556114eaa58dd067955d0048f931cd5a0ac369 100644 (file)
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -45,7 +45,7 @@
 
 static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr, u64 *reg)
 {
-       struct float_interrupt *fi = &vcpu->kvm->arch.float_int;
+       struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
        int rc;
 
        if (cpu_addr >= KVM_MAX_VCPUS)
@@ -71,9 +71,9 @@ static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr, u64 *reg)
 
 static int __sigp_emergency(struct kvm_vcpu *vcpu, u16 cpu_addr)
 {
-       struct float_interrupt *fi = &vcpu->kvm->arch.float_int;
-       struct local_interrupt *li;
-       struct interrupt_info *inti;
+       struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
+       struct kvm_s390_local_interrupt *li;
+       struct kvm_s390_interrupt_info *inti;
        int rc;
 
        if (cpu_addr >= KVM_MAX_VCPUS)
@@ -108,9 +108,9 @@ unlock:
 
 static int __sigp_stop(struct kvm_vcpu *vcpu, u16 cpu_addr, int store)
 {
-       struct float_interrupt *fi = &vcpu->kvm->arch.float_int;
-       struct local_interrupt *li;
-       struct interrupt_info *inti;
+       struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
+       struct kvm_s390_local_interrupt *li;
+       struct kvm_s390_interrupt_info *inti;
        int rc;
 
        if (cpu_addr >= KVM_MAX_VCPUS)
@@ -169,9 +169,9 @@ static int __sigp_set_arch(struct kvm_vcpu *vcpu, u32 parameter)
 static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address,
                             u64 *reg)
 {
-       struct float_interrupt *fi = &vcpu->kvm->arch.float_int;
-       struct local_interrupt *li;
-       struct interrupt_info *inti;
+       struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;
+       struct kvm_s390_local_interrupt *li;
+       struct kvm_s390_interrupt_info *inti;
        int rc;
        u8 tmp;