Commit 9c650d09 authored Apr 04, 2016 by Christian Borntraeger Committed by Paolo Bonzini Apr 05, 2016

s390/mm/kvm: fix mis-merge in gmap handling

commit 1e133ab2 ("s390/mm: split arch/s390/mm/pgtable.c") dropped
some changes from commit a3a92c31 ("KVM: s390: fix mismatch
between user and in-kernel guest limit") - this breaks KVM for some
memory sizes (kvm-s390: failed to commit memory region) like
exactly 2GB.

Cc: Dominik Dingel <dingel@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 14f47605

arch/s390/mm/gmap.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		/**
		* gmap_alloc - allocate a guest address space
		* @mm: pointer to the parent mm_struct
		* @limit: maximum size of the gmap address space
		* @limit: maximum address of the gmap address space
		*
		* Returns a guest address space structure.
		*/
		@@ -292,7 +292,7 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,
		if ((from \| to \| len) & (PMD_SIZE - 1))
		return -EINVAL;
		if (len == 0 \|\| from + len < from \|\| to + len < to \|\|
		from + len > TASK_MAX_SIZE \|\| to + len > gmap->asce_end)
		from + len - 1 > TASK_MAX_SIZE \|\| to + len - 1 > gmap->asce_end)
		return -EINVAL;

		flush = 0;