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