The patch titled
Subject: khugepaged: fix build without CONFIG_SHMEM
has been removed from the -mm tree. Its filename was
mmthp-add-read-only-thp-support-for-non-shmem-fs-fix.patch
This patch was dropped because it was folded into mmthp-add-read-only-thp-support-for-non-shmem-fs.patch
------------------------------------------------------
From: Song Liu <songliubraving@xxxxxx>
Subject: khugepaged: fix build without CONFIG_SHMEM
khugepaged_scan_file() should be fully bypassed without CONFIG_SHMEM.
Link: http://lkml.kernel.org/r/F53407FB-96CC-42E8-9862-105C92CC2B98@xxxxxx
Fixes: f57286140d96 ("mm,thp: add read-only THP support for (non-shmem) FS")
Signed-off-by: Song Liu <songliubraving@xxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/khugepaged.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/khugepaged.c~mmthp-add-read-only-thp-support-for-non-shmem-fs-fix
+++ a/mm/khugepaged.c
@@ -1776,7 +1776,7 @@ skip:
VM_BUG_ON(khugepaged_scan.address < hstart ||
khugepaged_scan.address + HPAGE_PMD_SIZE >
hend);
- if (vma->vm_file) {
+ if (IS_ENABLED(CONFIG_SHMEM) && vma->vm_file) {
struct file *file;
pgoff_t pgoff = linear_page_index(vma,
khugepaged_scan.address);
_
Patches currently in -mm which might be from songliubraving@xxxxxx are
filemap-check-compound_headpage-mapping-in-filemap_fault.patch
filemap-check-compound_headpage-mapping-in-pagecache_get_page.patch
filemap-update-offset-check-in-filemap_fault.patch
mmthp-stats-for-file-backed-thp.patch
khugepaged-rename-collapse_shmem-and-khugepaged_scan_shmem.patch
mmthp-add-read-only-thp-support-for-non-shmem-fs.patch
mmthp-add-read-only-thp-support-for-non-shmem-fs-fix-2.patch
mmthp-avoid-writes-to-file-with-thp-in-pagecache.patch
mm-move-memcmp_pages-and-pages_identical.patch
uprobe-use-original-page-when-all-uprobes-are-removed.patch
mm-thp-introduce-foll_split_pmd.patch
uprobe-use-foll_split_pmd-instead-of-foll_split.patch
khugepaged-enable-collapse-pmd-for-pte-mapped-thp.patch
uprobe-collapse-thp-pmd-after-removing-all-uprobes.patch
