summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorRadim Krčmář2016-07-21 14:20:42 +0200
committerRadim Krčmář2016-07-21 14:20:42 +0200
commit61f5dea179653558562ba9a5dd71eb29d91a383e (patch)
tree09be280e5bd85517b176060e4cdb3b4fa5a34c3d /include/uapi
parentKVM: x86: bump KVM_MAX_VCPU_ID to 1023 (diff)
parentKVM: s390: let ptff intercepts result in cc=3 (diff)
downloadkernel-qcow2-linux-61f5dea179653558562ba9a5dd71eb29d91a383e.tar.gz
kernel-qcow2-linux-61f5dea179653558562ba9a5dd71eb29d91a383e.tar.xz
kernel-qcow2-linux-61f5dea179653558562ba9a5dd71eb29d91a383e.zip
Merge tag 'kvm-s390-next-4.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next
KVM: s390: : Feature and fix for kvm/next (4.8) part 4 1. Provide an exit to userspace for the invalid opcode 0 (used for software breakpoints) 2. "Fix" (by returning condition code 3) some unhandled PTFF subcodes
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/kvm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 4f8030e5b05d..70941f4ab6d8 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -867,6 +867,7 @@ struct kvm_ppc_smmu_info {
#define KVM_CAP_VCPU_ATTRIBUTES 127
#define KVM_CAP_MAX_VCPU_ID 128
#define KVM_CAP_X2APIC_API 129
+#define KVM_CAP_S390_USER_INSTR0 130
#ifdef KVM_CAP_IRQ_ROUTING