diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-08-26 16:27:15 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-08-26 16:34:19 +0200 |
| commit | 88bf46bfde1eaa5f27bc5df75912b1ab7c7baf7e (patch) | |
| tree | 4ecd686f9d6a996f8713f033db1491e0a704969c /arch/s390/kvm | |
| parent | s390/tape: Use memdup_user() rather than duplicating its implementation (diff) | |
| parent | KVM: s390: generate facility mask from readable list (diff) | |
| download | linux-88bf46bfde1eaa5f27bc5df75912b1ab7c7baf7e.tar.xz linux-88bf46bfde1eaa5f27bc5df75912b1ab7c7baf7e.zip | |
Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
Pull facility mask patch from the KVM tree.
* tag 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: generate facility mask from readable list
Diffstat (limited to 'arch/s390/kvm')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index f142215ed30d..fd2f1201204e 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -132,10 +132,7 @@ module_param(nested, int, S_IRUGO); MODULE_PARM_DESC(nested, "Nested virtualization support"); /* upper facilities limit for kvm */ -unsigned long kvm_s390_fac_list_mask[16] = { - 0xffe6000000000000UL, - 0x005e000000000000UL, -}; +unsigned long kvm_s390_fac_list_mask[16] = { FACILITIES_KVM }; unsigned long kvm_s390_fac_list_mask_size(void) { |