The patch titled
Subject: mm-thp-register-mm-for-khugepaged-when-merging-vma-for-shmem-fix
has been added to the -mm tree. Its filename is
mm-thp-register-mm-for-khugepaged-when-merging-vma-for-shmem-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-thp-register-mm-for-khugepaged-when-merging-vma-for-shmem-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-thp-register-mm-for-khugepaged-when-merging-vma-for-shmem-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-thp-register-mm-for-khugepaged-when-merging-vma-for-shmem-fix
tweak comment, coding style
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN mm/khugepaged.c~mm-thp-register-mm-for-khugepaged-when-merging-vma-for-shmem-fix mm/khugepaged.c
--- a/mm/khugepaged.c~mm-thp-register-mm-for-khugepaged-when-merging-vma-for-shmem-fix
+++ a/mm/khugepaged.c
@@ -441,12 +441,13 @@ int khugepaged_enter_vma_merge(struct vm
*/
return 0;
if ((vma->vm_ops && (!shmem_file(vma->vm_file) || vma->anon_vma)) ||
- (vm_flags & VM_NO_KHUGEPAGED))
+ (vm_flags & VM_NO_KHUGEPAGED)) {
/*
- * khugepaged not yet working on non-shmem file or special
- * mappings. And, file-private shmem THP is not supported.
+ * khugepaged does not yet work on non-shmem files or special
+ * mappings. And file-private shmem THP is not supported.
*/
return 0;
+ }
hstart = (vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK;
hend = vma->vm_end & HPAGE_PMD_MASK;
if (hstart < hend)
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch
mm.patch
tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch
tools-adding-support-for-idle-page-tracking-to-tool-fix.patch
mm-thp-register-mm-for-khugepaged-when-merging-vma-for-shmem-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
