From patchwork Tue Jun 23 06:45:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nitin Gupta X-Patchwork-Id: 11619865 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E6D0912 for ; Tue, 23 Jun 2020 06:46:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D6878207D0 for ; Tue, 23 Jun 2020 06:46:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="LKidMHUe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6878207D0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 356A86B0005; Tue, 23 Jun 2020 02:46:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 305A16B0006; Tue, 23 Jun 2020 02:46:29 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F4BA6B0007; Tue, 23 Jun 2020 02:46:29 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0209.hostedemail.com [216.40.44.209]) by kanga.kvack.org (Postfix) with ESMTP id 0915D6B0005 for ; Tue, 23 Jun 2020 02:46:29 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id C17891DF9 for ; Tue, 23 Jun 2020 06:46:28 +0000 (UTC) X-FDA: 76959542856.15.value11_4d12a0026e39 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 96D1A1814B0C1 for ; Tue, 23 Jun 2020 06:46:28 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,nigupta@nvidia.com,,RULES_HIT:30054:30064:30070,0,RBL:216.228.121.143:@nvidia.com:.lbl8.mailshell.net-64.10.201.10 62.18.0.100;04ygdbn3k1oixjkbq4djwbaryuyi9ycad9ocdf3h7mt351gycmuse8ac7jaci3o.ddqjh6kbee5ktwosxfb4nai43xb6rnc84bx6w3qtie9qr7e77q88hiq5zik6so3.h-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: value11_4d12a0026e39 X-Filterd-Recvd-Size: 3428 Received: from hqnvemgate24.nvidia.com (hqnvemgate24.nvidia.com [216.228.121.143]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Tue, 23 Jun 2020 06:46:28 +0000 (UTC) Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 22 Jun 2020 23:44:55 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 22 Jun 2020 23:46:26 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 22 Jun 2020 23:46:26 -0700 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 23 Jun 2020 06:46:26 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Tue, 23 Jun 2020 06:46:26 +0000 Received: from ng-desktop.nvidia.com (Not Verified[10.110.48.88]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Mon, 22 Jun 2020 23:46:25 -0700 From: Nitin Gupta To: Andrew Morton CC: Nitin Gupta , Nitin Gupta , Nathan Chancellor , "open list:MEMORY MANAGEMENT" , open list Subject: [PATCH] mm: Fix compile error due to COMPACTION_HPAGE_ORDER Date: Mon, 22 Jun 2020 23:45:44 -0700 Message-ID: <20200623064544.25766-1-nigupta@nvidia.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1592894695; bh=sQDcI940fD/qM5n2u+V5GJ+0quSFLSiPSXJWwk8BXlA=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Transfer-Encoding:Content-Type; b=LKidMHUezYnfC231U1hU2as/V8fJLmd8X9WdJ2nJ+Fm/HHijTx4gI0OR37xNu5oTD NMWEXy8MoQH94wTf2C2EeREO4WL8Y9ZQ1tk4K883++yGn3+YhWlhlW9eOJaKKxpJW4 pQ24MGkBasnUt8vxZYI5jXnSm1jpgYPRyUkDlP+hY6m9wyKUcrfupaD9jNcQAV+OOO lgbQY9KPeS50K1cxF5z6gCbHbC2hdwYpkRE5T5L7hMoMODorjWwwsXETRgng91OfU7 QSFeqrdHbMREAVccZzPbsD5lIfi3xJnQTuyRl0Lh/ZCbEI3k8x4ZN6ZxeIdDYBbGJO PIhM1YDJxW/oA== X-Rspamd-Queue-Id: 96D1A1814B0C1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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: Fix compile error when COMPACTION_HPAGE_ORDER is assigned to HUGETLB_PAGE_ORDER. The correct way to check if this constant is defined is to check for CONFIG_HUGETLBFS. Signed-off-by: Nitin Gupta To: Andrew Morton Reported-by: Nathan Chancellor Tested-by: Nathan Chancellor --- mm/compaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/compaction.c b/mm/compaction.c index 45fd24a0ea0b..02963ffb9e70 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -62,7 +62,7 @@ static const unsigned int HPAGE_FRAG_CHECK_INTERVAL_MSEC = 500; */ #if defined CONFIG_TRANSPARENT_HUGEPAGE #define COMPACTION_HPAGE_ORDER HPAGE_PMD_ORDER -#elif defined HUGETLB_PAGE_ORDER +#elif defined CONFIG_HUGETLBFS #define COMPACTION_HPAGE_ORDER HUGETLB_PAGE_ORDER #else #define COMPACTION_HPAGE_ORDER (PMD_SHIFT - PAGE_SHIFT)