Hi Song,
On Wed, 7 Aug 2019 22:11:28 +0000 Song Liu <songliubraving@xxxxxx> wrote:
>
> From: Song Liu <songliubraving@xxxxxx>
> Date: Wed, 7 Aug 2019 14:57:38 -0700
> Subject: [PATCH] khugepaged: fix build without CONFIG_SHMEM
>
> khugepaged_scan_file() should be fully bypassed without CONFIG_SHMEM.
>
> Fixes: f57286140d96 ("mm,thp: add read-only THP support for (non-shmem) FS")
> Signed-off-by: Song Liu <songliubraving@xxxxxx>
> ---
> mm/khugepaged.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index 272fed3ed0f0..40c25ddf29e4 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -1778,7 +1778,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
> 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);
I have applied this to linux-next today (it needed a little adjusting
after removing the other patches).
--
Cheers,
Stephen Rothwell
Attachment:
pgpOsOhE5pQra.pgp
Description: OpenPGP digital signature
