summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-07-03 10:41:59 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2017-07-03 10:41:59 +0200
commit8a53e7e572252e551fd4b172dc207f8beca1ae20 (patch)
treef3b83b47815ab2b56377188d02c7217048056c2d /include/uapi
parent00c14757f6abacd78cad9b2690a0e1f42e4b76c8 (diff)
parent8b24e69fc47e43679bb29ddb481aa0e8dce2a3c5 (diff)
downloadlinux-8a53e7e572252e551fd4b172dc207f8beca1ae20.tar.bz2
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
- Better machine check handling for HV KVM - Ability to support guests with threads=2, 4 or 8 on POWER9 - Fix for a race that could cause delayed recognition of signals - Fix for a bug where POWER9 guests could sleep with interrupts pending.
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/kvm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 2b8dc1ca18d4..c0b6dfec5f87 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -925,6 +925,8 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_X86_GUEST_MWAIT 143
#define KVM_CAP_ARM_USER_IRQ 144
#define KVM_CAP_S390_CMMA_MIGRATION 145
+#define KVM_CAP_PPC_FWNMI 146
+#define KVM_CAP_PPC_SMT_POSSIBLE 147
#ifdef KVM_CAP_IRQ_ROUTING