summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm/kvm-s390.c
diff options
context:
space:
mode:
authorDavid Hildenbrand2015-11-24 13:53:04 +0100
committerChristian Borntraeger2016-06-10 12:07:19 +0200
commitc24cc9c8a6ca798427d3ff46b55df8403361df3e (patch)
tree379fbfa1fcb1d827ab50c5fa40ac01f46960df71 /arch/s390/kvm/kvm-s390.c
parents390/sclp: detect cmma (diff)
downloadkernel-qcow2-linux-c24cc9c8a6ca798427d3ff46b55df8403361df3e.tar.gz
kernel-qcow2-linux-c24cc9c8a6ca798427d3ff46b55df8403361df3e.tar.xz
kernel-qcow2-linux-c24cc9c8a6ca798427d3ff46b55df8403361df3e.zip
KVM: s390: enable CMMA if the interpration is available
Now that we can detect if collaborative-memory-management interpretation is available, replace the heuristic by a real hardware detection. Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
-rw-r--r--arch/s390/kvm/kvm-s390.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index e477c8e5b5c1..005e664f6360 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -485,9 +485,8 @@ static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_attr *att
unsigned int idx;
switch (attr->attr) {
case KVM_S390_VM_MEM_ENABLE_CMMA:
- /* enable CMMA only for z10 and later (EDAT_1) */
ret = -EINVAL;
- if (!MACHINE_IS_LPAR || !MACHINE_HAS_EDAT1)
+ if (!sclp.has_cmma)
break;
ret = -EBUSY;