s390/mm/kvm: fix mis-merge in gmap handling
authorChristian Borntraeger <borntraeger@de.ibm.com>
Mon, 4 Apr 2016 07:41:32 +0000 (09:41 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Apr 2016 12:19:07 +0000 (14:19 +0200)
commit9c650d09a9c3029cc90cae5d2cd7ab131bdb86c2
treeebca9199dd2be43af77cf6535acb63cd3f304cb0
parent14f4760562e41d50817d56b42c821d70ad10b483
s390/mm/kvm: fix mis-merge in gmap handling

commit 1e133ab296f3 ("s390/mm: split arch/s390/mm/pgtable.c") dropped
some changes from commit a3a92c31bf0b ("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>
arch/s390/mm/gmap.c