projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6-block.git]
/
mm
/
khugepaged.c
diff --git
a/mm/khugepaged.c
b/mm/khugepaged.c
index 43cb3043311bdab1c302955533d7aee137e5b869..ea4ff259b67195b32d3335795d4de80c4e6e5bcf 100644
(file)
--- a/
mm/khugepaged.c
+++ b/
mm/khugepaged.c
@@
-1270,7
+1270,7
@@
static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff)
_pmd = pmdp_collapse_flush(vma, addr, pmd);
spin_unlock(ptl);
up_write(&vma->vm_mm->mmap_sem);
-
atomic_long_dec(&vma->vm_mm->nr_ptes
);
+
mm_dec_nr_ptes(vma->vm_mm
);
pte_free(vma->vm_mm, pmd_pgtable(_pmd));
}
}