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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8321BC433F5 for ; Sat, 7 May 2022 18:55:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D29AF6B0071; Sat, 7 May 2022 14:55:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CD6DB6B0073; Sat, 7 May 2022 14:55:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B78406B0074; Sat, 7 May 2022 14:55:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A8A286B0071 for ; Sat, 7 May 2022 14:55:14 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 8CD5380708 for ; Sat, 7 May 2022 18:55:14 +0000 (UTC) X-FDA: 79439849748.11.B88C65B Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id 2AB4820082 for ; Sat, 7 May 2022 18:55:06 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 29C4361170; Sat, 7 May 2022 18:55:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46292C385A6; Sat, 7 May 2022 18:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1651949712; bh=7rn33Sp/e6WnCbFwK/qpy6Dee1uaXAmD+nFiEx4fKm8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=EptbxKmh5IABjgpAEmn6sOR4C+RQQsW3FGxSo6190QIdcApQ3SBVTMm7924/fdRTq pr0D5/E0vWYsA+sRvZ+Iw4RqlSYpzL39jj1VueSiuxyGLTcrhAM/IJVOQ1T4HKZx3s +JV9jx5SCOdwIU3G/RF8vWJjSDNZxzyjizrZyZOY= Date: Sat, 7 May 2022 11:55:11 -0700 From: Andrew Morton To: cgel.zte@gmail.com Cc: hughd@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yang Yang , Zeal Robot , Matthew Wilcox Subject: Re: [PATCH] mm/shmem: fix build failure when CONFIG_TRANSPARENT_HUGEPAGE is not set Message-Id: <20220507115511.bfe87f9126aefad64894807e@linux-foundation.org> In-Reply-To: <20220505113354.202979-1-xu.xin16@zte.com.cn> References: <20220505113354.202979-1-xu.xin16@zte.com.cn> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Stat-Signature: di6pggnq17prs8p44hpysy85gpffektx Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=EptbxKmh; spf=pass (imf03.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 2AB4820082 X-HE-Tag: 1651949706-849495 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, 5 May 2022 11:33:55 +0000 cgel.zte@gmail.com wrote: > From: Yang Yang > > shmem_add_to_page_cache() use THP_FILE_FALLBACK even if > CONFIG_TRANSPARENT_HUGEPAGE is not set and triggers this > compile error. > > Add ifdef CONFIG_TRANSPARENT_HUGEPAGE in shmem_add_to_page_cache(). Thanks. > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -717,10 +717,12 @@ static int shmem_add_to_page_cache(struct folio *folio, > if (!folio_test_swapcache(folio)) { > error = mem_cgroup_charge(folio, charge_mm, gfp); > if (error) { > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > if (folio_test_large(folio)) { > count_vm_event(THP_FILE_FALLBACK); > count_vm_event(THP_FILE_FALLBACK_CHARGE); > } > +#endif > goto error; > } > } I believe Matthew address this in version 2 of "Folio patches for 5.19". I'm aiming to get that (and much more!) pushed out or Monday's linux-next.