Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c24cc9c8 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

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: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 09be9cb9

arch/s390/kvm/kvm-s390.c

+1 −2
Original line number Diff line number Diff line
@@ -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;