From patchwork Tue Jun 16 04:08:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 11606369 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 57A8460D for ; Tue, 16 Jun 2020 04:08:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1CA212070C for ; Tue, 16 Jun 2020 04:08:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CA212070C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 200816B0006; Tue, 16 Jun 2020 00:08:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1B1EB6B0007; Tue, 16 Jun 2020 00:08:39 -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 0A0C76B000C; Tue, 16 Jun 2020 00:08:39 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0223.hostedemail.com [216.40.44.223]) by kanga.kvack.org (Postfix) with ESMTP id E0C116B0006 for ; Tue, 16 Jun 2020 00:08:38 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 75D48181AC9BF for ; Tue, 16 Jun 2020 04:08:38 +0000 (UTC) X-FDA: 76933743516.29.van95_610d7a126dfc Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 55D2D18086E38 for ; Tue, 16 Jun 2020 04:08:38 +0000 (UTC) X-Spam-Summary: 2,0,0,f194c697c091161f,d41d8cd98f00b204,anshuman.khandual@arm.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1261:1345:1431:1437:1534:1541:1711:1730:1747:1777:1792:1963:2282:2393:2559:2562:2895:3138:3139:3140:3141:3142:3353:3369:3865:3867:3868:3870:3871:3872:3874:5007:6119:6261:7875:7903:8634:9036:10004:11026:11232:11473:11658:11914:12114:12296:12297:12438:12555:12895:13069:13095:13141:13153:13181:13228:13229:13230:13311:13357:13846:14096:14181:14384:14394:14721:14819:21080:21433:21451:21627:21990:30054:30070,0,RBL:217.140.110.172:@arm.com:.lbl8.mailshell.net-64.201.201.201 62.14.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: van95_610d7a126dfc X-Filterd-Recvd-Size: 2795 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Tue, 16 Jun 2020 04:08:37 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 002E51F1; Mon, 15 Jun 2020 21:08:36 -0700 (PDT) Received: from p8cg001049571a15.arm.com (unknown [10.163.80.105]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2DADD3F6CF; Mon, 15 Jun 2020 21:08:34 -0700 (PDT) From: Anshuman Khandual To: linux-mm@kvack.org Cc: Anshuman Khandual , Arnd Bergmann , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/pgtable: Move extern zero_pfn outside __HAVE_COLOR_ZERO_PAGE Date: Tue, 16 Jun 2020 09:38:18 +0530 Message-Id: <1592280498-15442-1-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 X-Rspamd-Queue-Id: 55D2D18086E38 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: zero_pfn variable is required whether __HAVE_COLOR_ZERO_PAGE is enabled or not. Also it should not really be declared individually in all functions where it gets used. Just move the declaration outside, which also makes it available for other potential users. Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- Applies on 5.8-rc1. If the earlier motivation was to hide zero_pfn from general visibility, we could just put in a comment and update the commit message that my_zero_pfn() should always be used rather than zero_pfn. Build tested on many platforms and boot tested on arm64, x86. include/linux/pgtable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 32b6c52d41b9..078e9864abca 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1020,10 +1020,11 @@ extern void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, extern void untrack_pfn_moved(struct vm_area_struct *vma); #endif +extern unsigned long zero_pfn; + #ifdef __HAVE_COLOR_ZERO_PAGE static inline int is_zero_pfn(unsigned long pfn) { - extern unsigned long zero_pfn; unsigned long offset_from_zero_pfn = pfn - zero_pfn; return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT); } @@ -1033,13 +1034,11 @@ static inline int is_zero_pfn(unsigned long pfn) #else static inline int is_zero_pfn(unsigned long pfn) { - extern unsigned long zero_pfn; return pfn == zero_pfn; } static inline unsigned long my_zero_pfn(unsigned long addr) { - extern unsigned long zero_pfn; return zero_pfn; } #endif