The patch titled
Subject: khugepaged: fix build without CONFIG_SHMEM
has been added to the -mm tree. Its filename is
mmthp-add-read-only-thp-support-for-non-shmem-fs-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mmthp-add-read-only-thp-support-for-non-shmem-fs-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mmthp-add-read-only-thp-support-for-non-shmem-fs-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: 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.patch
mmthp-avoid-writes-to-file-with-thp-in-pagecache.patch
