summaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm/generic_64.c
diff options
context:
space:
mode:
authorAndrea Arcangeli2011-01-14 00:46:43 +0100
committerLinus Torvalds2011-01-14 02:32:40 +0100
commit8ac1f8320a0073f28cf9e0491af4cd98f504f92a (patch)
tree4dad891c302587fdc7b099b18e05d7dbc5526c64 /arch/sparc/mm/generic_64.c
parentthp: bail out gup_fast on splitting pmd (diff)
downloadkernel-qcow2-linux-8ac1f8320a0073f28cf9e0491af4cd98f504f92a.tar.gz
kernel-qcow2-linux-8ac1f8320a0073f28cf9e0491af4cd98f504f92a.tar.xz
kernel-qcow2-linux-8ac1f8320a0073f28cf9e0491af4cd98f504f92a.zip
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: Andrea Arcangeli <aarcange@redhat.com> Acked-by: Rik van Riel <riel@redhat.com> Acked-by: Mel Gorman <mel@csn.ul.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc/mm/generic_64.c')
-rw-r--r--arch/sparc/mm/generic_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/generic_64.c b/arch/sparc/mm/generic_64.c
index 04f2bf4cd571..3cb00dfd4bd6 100644
--- a/arch/sparc/mm/generic_64.c
+++ b/arch/sparc/mm/generic_64.c
@@ -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);