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

Commit 8ac1f832 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

thp: pte alloc trans splitting 



pte alloc routines must wait for split_huge_page if the pmd is not present
and not null (i.e.  pmd_trans_splitting).  The additional branches are
optimized away at compile time by pmd_trans_splitting if the config option
is off.  However we must pass the vma down in order to know the anon_vma
lock to wait for.

[akpm@linux-foundation.org: coding-style fixes]
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 64cc6ae0

arch/arm/mm/pgd.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) 
		if (!new_pmd)

			goto no_pmd;



		new_pte = pte_alloc_map(mm, new_pmd, 0);

		new_pte = pte_alloc_map(mm, NULL, new_pmd, 0);

		if (!new_pte)

			goto no_pte;

arch/ia64/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) 
	if (pud) {

		pmd = pmd_alloc(mm, pud, taddr);

		if (pmd)

			pte = pte_alloc_map(mm, pmd, taddr);

			pte = pte_alloc_map(mm, NULL, pmd, taddr);

	}

	return pte;

}

arch/sh/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, 
		if (pud) {

			pmd = pmd_alloc(mm, pud, addr);

			if (pmd)

				pte = pte_alloc_map(mm, pmd, addr);

				pte = pte_alloc_map(mm, NULL, pmd, addr);

		}

	}

arch/sparc/mm/generic_32.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static inline int io_remap_pmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned 
		end = PGDIR_SIZE;

	offset -= address;

	do {

		pte_t * pte = pte_alloc_map(mm, pmd, address);

		pte_t *pte = pte_alloc_map(mm, NULL, pmd, address);

		if (!pte)

			return -ENOMEM;

		io_remap_pte_range(mm, pte, address, end - address, address + offset, prot, space);

arch/sparc/mm/generic_64.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static inline int io_remap_pmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned 
		end = PGDIR_SIZE;

	offset -= address;

	do {

		pte_t * pte = pte_alloc_map(mm, pmd, address);

		pte_t *pte = pte_alloc_map(mm, NULL, pmd, address);

		if (!pte)

			return -ENOMEM;

		io_remap_pte_range(mm, pte, address, end - address, address + offset, prot, space);