diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-03 09:03:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-03 09:03:50 -0700 |
| commit | f0395d5b4d691164a6e4d107590636db80b29bf6 (patch) | |
| tree | 6a362f035c703d3d1719deb2ae6c9cd8ce8ca671 /mm/huge_memory.c | |
| parent | fb615d61b5583db92e3793709b97e35dc9499c2a (diff) | |
| parent | 2628bd6fc052bd85e9864dae4de494d8a6313391 (diff) | |
| download | linux-f0395d5b4d691164a6e4d107590636db80b29bf6.tar.gz linux-f0395d5b4d691164a6e4d107590636db80b29bf6.tar.bz2 linux-f0395d5b4d691164a6e4d107590636db80b29bf6.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"7 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, swap: fix race between swap count continuation operations
mm/huge_memory.c: deposit page table when copying a PMD migration entry
initramfs: fix initramfs rebuilds w/ compression after disabling
fs/hugetlbfs/inode.c: fix hwpoison reserve accounting
ocfs2: fstrim: Fix start offset of first cluster group during fstrim
mm, /proc/pid/pagemap: fix soft dirty marking for PMD migration entry
userfaultfd: hugetlbfs: prevent UFFDIO_COPY to fill beyond the end of i_size
Diffstat (limited to 'mm/huge_memory.c')
| -rw-r--r-- | mm/huge_memory.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 269b5df58543..1981ed697dab 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -941,6 +941,9 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm, pmd = pmd_swp_mksoft_dirty(pmd); set_pmd_at(src_mm, addr, src_pmd, pmd); } + add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR); + atomic_long_inc(&dst_mm->nr_ptes); + pgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable); set_pmd_at(dst_mm, addr, dst_pmd, pmd); ret = 0; goto out_unlock; |