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

Commit 8bea8052 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm/hugetlb.c: use huge_pte_lock instead of opencoding the lock 

No functional change by this patch.

Link: http://lkml.kernel.org/r/20161018090234.22574-1-aneesh.kumar@linux.vnet.ibm.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3999f52e

mm/hugetlb.c

+2 −4
Original line number Diff line number Diff line
@@ -3713,8 +3713,7 @@ static int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma, 
		vma_end_reservation(h, vma, address);

	}



	ptl = huge_pte_lockptr(h, mm, ptep);

	spin_lock(ptl);

	ptl = huge_pte_lock(h, mm, ptep);

	size = i_size_read(mapping->host) >> huge_page_shift(h);

	if (idx >= size)

		goto backout;
@@ -4332,8 +4331,7 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud) 
	if (!spte)

		goto out;



	ptl = huge_pte_lockptr(hstate_vma(vma), mm, spte);

	spin_lock(ptl);

	ptl = huge_pte_lock(hstate_vma(vma), mm, spte);

	if (pud_none(*pud)) {

		pud_populate(mm, pud,

				(pmd_t *)((unsigned long)spte & PAGE_MASK));