From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 7 Apr 2015 16:10:03 +0000 (+0200)
Subject: Merge tag 'kvm-s390-next-20150331' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~10342^2~19
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f22b45d66b8e603e2e85e78f209531779f8b1cc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'kvm-s390-next-20150331' of git://git./linux/kernel/git/kvms390/linux into HEAD

Features and fixes for 4.1 (kvm/next)

1. Assorted changes
1.1 allow more feature bits for the guest
1.2 Store breaking event address on program interrupts

2. Interrupt handling rework
2.1 Fix copy_to_user while holding a spinlock (cc stable)
2.2 Rework floating interrupts to follow the priorities
2.3 Allow to inject all local interrupts via new ioctl
2.4 allow to get/set the full local irq state, e.g. for migration
    and introspection
---

7f22b45d66b8e603e2e85e78f209531779f8b1cc
diff --cc include/uapi/linux/kvm.h
index 05a2083f7a28,c045c725e521..f574d7be7631
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -802,8 -809,8 +809,10 @@@ 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_MIPS_FPU 111
 +#define KVM_CAP_MIPS_MSA 112
+ #define KVM_CAP_S390_INJECT_IRQ 113
+ #define KVM_CAP_S390_IRQ_STATE 114
  
  #ifdef KVM_CAP_IRQ_ROUTING