summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2018-08-02 13:57:29 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2018-08-02 13:57:29 +0200
commit85eae57bbb0612387201635659be543aaac2109e (patch)
tree87ab615194c224fd810076633ea03008c5a5c51b /include/uapi/linux
parent3a1174cd3edbd6d822388ee1806669a9328872ce (diff)
parent2375846193663a1282c0ef7093640ed3210dc09f (diff)
downloadlinux-85eae57bbb0612387201635659be543aaac2109e.tar.gz
linux-85eae57bbb0612387201635659be543aaac2109e.tar.bz2
linux-85eae57bbb0612387201635659be543aaac2109e.zip
Merge tag 'kvm-s390-next-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Features for 4.19 - initial version for host large page support. Must be enabled with module parameter hpage=1 and will conflict with the nested=1 parameter. - enable etoken facility for guests - Fixes
Diffstat (limited to 'include/uapi/linux')
-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 b6270a3b38e9..b955b986b341 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -949,6 +949,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_GET_MSR_FEATURES 153
#define KVM_CAP_HYPERV_EVENTFD 154
#define KVM_CAP_HYPERV_TLBFLUSH 155
+#define KVM_CAP_S390_HPAGE_1M 156
#ifdef KVM_CAP_IRQ_ROUTING