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

Commit 66e9bbdb authored by Dominik Dingel's avatar Dominik Dingel Committed by Martin Schwidefsky
Browse files

s390/mm: fixing calls of pte_unmap_unlock 



pte_unmap works on page table entry pointers, derefencing should be avoided.
As on s390 pte_unmap is a NOP, this is more a cleanup if we want to supply
later such function.

Signed-off-by: default avatarDominik Dingel <dingel@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c9eeb7b8

arch/s390/mm/pgtable.c

+3 −3
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ void __gmap_zap(struct gmap *gmap, unsigned long gaddr) 
	}

	pgste_set_unlock(ptep, pgste);

out_pte:

	pte_unmap_unlock(*ptep, ptl);

	pte_unmap_unlock(ptep, ptl);

}

EXPORT_SYMBOL_GPL(__gmap_zap);
@@ -943,7 +943,7 @@ int set_guest_storage_key(struct mm_struct *mm, unsigned long addr, 
	}

	if (!(pte_val(*ptep) & _PAGE_INVALID) &&

	     (pte_val(*ptep) & _PAGE_PROTECT)) {

		pte_unmap_unlock(*ptep, ptl);

		pte_unmap_unlock(ptep, ptl);

		if (fixup_user_fault(current, mm, addr, FAULT_FLAG_WRITE)) {

			up_read(&mm->mmap_sem);

			return -EFAULT;
@@ -974,7 +974,7 @@ int set_guest_storage_key(struct mm_struct *mm, unsigned long addr, 
		pgste_val(new) |= PGSTE_UC_BIT;



	pgste_set_unlock(ptep, new);

	pte_unmap_unlock(*ptep, ptl);

	pte_unmap_unlock(ptep, ptl);

	up_read(&mm->mmap_sem);

	return 0;

}