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

Commit 14fd403f authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

thp: export maybe_mkwrite 



huge_memory.c needs it too when it fallbacks in copying hugepages into
regular fragmented pages if hugepage allocation fails during COW.

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2609ae6d

include/linux/mm.h

+13 −0
Original line number Diff line number Diff line
@@ -429,6 +429,19 @@ static inline void set_compound_order(struct page *page, unsigned long order) 
	page[1].lru.prev = (void *)order;

}



/*

 * Do pte_mkwrite, but only if the vma says VM_WRITE.  We do this when

 * servicing faults for write access.  In the normal case, do always want

 * pte_mkwrite.  But get_user_pages can cause write faults for mappings

 * that do not have writing enabled, when used by access_process_vm.

 */

static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)

{

	if (likely(vma->vm_flags & VM_WRITE))

		pte = pte_mkwrite(pte);

	return pte;

}



/*

 * Multiple processes may "see" the same page. E.g. for untouched

 * mappings of /dev/null, all processes see the same page full of

mm/memory.c

+0 −13
Original line number Diff line number Diff line
@@ -2083,19 +2083,6 @@ static inline int pte_unmap_same(struct mm_struct *mm, pmd_t *pmd, 
	return same;

}



/*

 * Do pte_mkwrite, but only if the vma says VM_WRITE.  We do this when

 * servicing faults for write access.  In the normal case, do always want

 * pte_mkwrite.  But get_user_pages can cause write faults for mappings

 * that do not have writing enabled, when used by access_process_vm.

 */

static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)

{

	if (likely(vma->vm_flags & VM_WRITE))

		pte = pte_mkwrite(pte);

	return pte;

}



static inline void cow_user_page(struct page *dst, struct page *src, unsigned long va, struct vm_area_struct *vma)

{

	/*