From: Jens Freimann <jf...@linux.vnet.ibm.com> - change "__user u8" to u8 "__user" - avoid unnecessary casts - use capability numbers 113 and 114
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index ee2dfdc..9de4726 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -1613,7 +1613,7 @@ void kvm_s390_clear_float_irqs(struct kvm *kvm) spin_unlock(&fi->lock); }; -static int get_all_floating_irqs(struct kvm *kvm, __user __u8 *usrbuf, __u64 len) +static int get_all_floating_irqs(struct kvm *kvm, u8 __user *usrbuf, u64 len) { struct kvm_s390_interrupt_info *inti; struct kvm_s390_float_interrupt *fi; @@ -1677,9 +1677,7 @@ static int get_all_floating_irqs(struct kvm *kvm, __user __u8 *usrbuf, __u64 len out: spin_unlock(&fi->lock); if (!ret && n > 0) { - if (copy_to_user((void __user *) usrbuf, - (void *) buf, - sizeof(struct kvm_s390_irq) * n)) + if (copy_to_user(usrbuf, buf, sizeof(struct kvm_s390_irq) * n)) ret = -EFAULT; } vfree(buf); @@ -1693,7 +1691,7 @@ static int flic_get_attr(struct kvm_device *dev, struct kvm_device_attr *attr) switch (attr->group) { case KVM_DEV_FLIC_GET_ALL_IRQS: - r = get_all_floating_irqs(dev->kvm, (__user u8 *) attr->addr, + r = get_all_floating_irqs(dev->kvm, (u8 __user *) attr->addr, attr->attr); break; default: diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 7437ce9..c045c72 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -809,8 +809,8 @@ struct kvm_ppc_smmu_info { #define KVM_CAP_S390_MEM_OP 108 #define KVM_CAP_S390_USER_STSI 109 #define KVM_CAP_S390_SKEYS 110 -#define KVM_CAP_S390_INJECT_IRQ 111 -#define KVM_CAP_S390_IRQ_STATE 112 +#define KVM_CAP_S390_INJECT_IRQ 113 +#define KVM_CAP_S390_IRQ_STATE 114 #ifdef KVM_CAP_IRQ_ROUTING -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html