Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Song Liu <songliubraving@fb.com>
Cc: Randy Dunlap <rdunlap@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux MM <linux-mm@kvack.org>
Subject: Re: linux-next: Tree for Aug 7 (mm/khugepaged.c)
Date: Thu, 8 Aug 2019 11:31:30 +1000
Message-ID: <20190808113130.4cc2902f@canb.auug.org.au> (raw)
In-Reply-To: <F53407FB-96CC-42E8-9862-105C92CC2B98@fb.com>

[-- Attachment #1: Type: text/plain, Size: 1434 bytes --]

Hi Song,

On Wed, 7 Aug 2019 22:11:28 +0000 Song Liu <songliubraving@fb.com> wrote:
>
> From: Song Liu <songliubraving@fb.com>
> 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@fb.com>
> ---
>  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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply index

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-07  8:36 linux-next: Tree for Aug 7 Stephen Rothwell
2019-08-07 15:11 ` linux-next: Tree for Aug 7 (mm/khugepaged.c) Randy Dunlap
2019-08-07 16:59   ` Song Liu
2019-08-07 20:10     ` Andrew Morton
2019-08-07 21:00       ` Song Liu
2019-08-07 21:27         ` Andrew Morton
2019-08-07 21:30           ` Randy Dunlap
2019-08-07 22:11             ` Song Liu
2019-08-08  1:31               ` Stephen Rothwell [this message]
2019-08-07 22:13           ` Song Liu
2019-08-08  1:20           ` Stephen Rothwell
2019-08-07 15:29 ` linux-next: Tree for Aug 7 (net/bridge/netfilter/nf_conntrack_bridge.c) Randy Dunlap
2019-08-07 15:57   ` Jeremy Sowden
2019-09-23 22:26     ` Ivan Kalvachev
2019-09-23 22:48       ` Jeremy Sowden
2019-08-08  5:13 ` linux-next: Tree for Aug 7 Michael Ellerman
2019-08-08 15:54   ` Gustavo A. R. Silva

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190808113130.4cc2902f@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=songliubraving@fb.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git