From: Radim Krčmář Date: Tue, 11 Apr 2017 18:54:40 +0000 (+0200) Subject: Merge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'kvm-s390-next-4.12-1' of git://git./linux/kernel/git/kvms390/linux From: Christian Borntraeger KVM: s390: features for 4.12 1. guarded storage support for guests This contains an s390 base Linux feature branch that is necessary to implement the KVM part 2. Provide an interface to implement adapter interruption suppression which is necessary for proper zPCI support 3. Use more defines instead of numbers 4. Provide logging for lazy enablement of runtime instrumentation --- f7b1a77d3bfbdc7e91a1e48e0a3dc10e7d890e04 diff --cc include/uapi/linux/kvm.h index 1e1a6c728a18,33dd2a4e36dc..6180ea50e9ef --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@@ -887,9 -883,8 +887,11 @@@ struct kvm_ppc_resize_hpt #define KVM_CAP_PPC_MMU_RADIX 134 #define KVM_CAP_PPC_MMU_HASH_V3 135 #define KVM_CAP_IMMEDIATE_EXIT 136 -#define KVM_CAP_S390_GS 137 -#define KVM_CAP_S390_AIS 138 +#define KVM_CAP_MIPS_VZ 137 +#define KVM_CAP_MIPS_TE 138 +#define KVM_CAP_MIPS_64BIT 139 ++#define KVM_CAP_S390_GS 140 ++#define KVM_CAP_S390_AIS 141 #ifdef KVM_CAP_IRQ_ROUTING