From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC8D8C433FF for ; Thu, 8 Aug 2019 01:31:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8228321873 for ; Thu, 8 Aug 2019 01:31:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="AxY1O5I9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730675AbfHHBbf (ORCPT ); Wed, 7 Aug 2019 21:31:35 -0400 Received: from ozlabs.org ([203.11.71.1]:50273 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730382AbfHHBbf (ORCPT ); Wed, 7 Aug 2019 21:31:35 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 463rSM2nrcz9sN4; Thu, 8 Aug 2019 11:31:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1565227891; bh=VskflzzaHB3YqEhRaWaqpmXfLtKuW7+a50wQ5+qwMzA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=AxY1O5I9qBH6ATA9yYG+iwxjXgQd6T44GfBT3kn9e5nQ3Lccakt9z1jIOUapSTl8a ZDsBr8EmPZDgdIbBxyTJ6hHqKzlax4iuuufbrMpvpHJOGzRqCBUMgGC57dWC9vEHK8 FmM+AOWCdyX2sddSaOdsWiuZYeSRDje6Sq4coEnGqoPiR2jKcK8pHIGtSPHb6vo75W 92Xe7N2txysoLxQYPSw8wRbNlGbJ5deDKnYRE58ZwhRb4AlBzmS3gKSy/mTR+PHL8p iZMFa92SHIYkLBizRhuzg+YQkHkTZJJlXf0nwfdH0c7BRDdvJmHi6KE7WAehW2o+8K yP63ZpyGsZS1g== Date: Thu, 8 Aug 2019 11:31:30 +1000 From: Stephen Rothwell To: Song Liu Cc: Randy Dunlap , Andrew Morton , Linux Next Mailing List , Linux Kernel Mailing List , Linux MM Subject: Re: linux-next: Tree for Aug 7 (mm/khugepaged.c) Message-ID: <20190808113130.4cc2902f@canb.auug.org.au> In-Reply-To: References: <20190807183606.372ca1a4@canb.auug.org.au> <20190807131029.f7f191aaeeb88cc435c6306f@linux-foundation.org> <20190807142755.8211d58d5ecec8082587b073@linux-foundation.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/yhc0x6v6fDgfN4ZWUXD5eHT"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/yhc0x6v6fDgfN4ZWUXD5eHT Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Song, On Wed, 7 Aug 2019 22:11:28 +0000 Song Liu wrote: > > From: Song Liu > Date: Wed, 7 Aug 2019 14:57:38 -0700 > Subject: [PATCH] khugepaged: fix build without CONFIG_SHMEM >=20 > khugepaged_scan_file() should be fully bypassed without CONFIG_SHMEM. >=20 > Fixes: f57286140d96 ("mm,thp: add read-only THP support for (non-shmem) F= S") > Signed-off-by: Song Liu > --- > mm/khugepaged.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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(unsigne= d int pages, > VM_BUG_ON(khugepaged_scan.address < hstart || > khugepaged_scan.address + HPAGE_PMD_SIZ= E > > hend); > - if (vma->vm_file) { > + if (IS_ENABLED(CONFIG_SHMEM) && vma->vm_file) { > struct file *file; > pgoff_t pgoff =3D 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). --=20 Cheers, Stephen Rothwell --Sig_/yhc0x6v6fDgfN4ZWUXD5eHT Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1Le3IACgkQAVBC80lX 0GymPwf/Yptoay9yV8VDu8pDytNxBrsnHMGbQJ5LRMb9crEICeyHb4JVvUS4W6I7 KAcTGuB5yrUGdhYIQFU/mgiqxxAerpKch6t1Lw2PjzB+iCkQAST/OTcTmni38ln9 L+KsyAJR3AyAU6bY7u+CoWnbUeFmWV+itElbvhtJeGw8eAjbjs2OGWup03J4bJXJ cnaY61rM0ViOVXS2tbzMJZt5j736Olu3UHRmEA4FxekLP8NHlfNm9WSmqFUOIhA5 M/zYa1NueNlchfMt3S/b+6TKxwRd3xCiFwUe0fIq04oQIhIxtqXpYv/lkvmIbja7 F13gAR8XbAdTeSucyWzRJ+16APO80A== =5rKS -----END PGP SIGNATURE----- --Sig_/yhc0x6v6fDgfN4ZWUXD5eHT--