From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A39042121797F for ; Fri, 26 Apr 2019 07:04:43 -0700 (PDT) Date: Fri, 26 Apr 2019 16:04:39 +0200 From: Oscar Salvador Subject: Re: [PATCH v6 07/12] mm: Kill is_dev_zone() helper Message-ID: <20190426140439.GC30513@linux> References: <155552633539.2015392.2477781120122237934.stgit@dwillia2-desk3.amr.corp.intel.com> <155552637207.2015392.16917498971420465931.stgit@dwillia2-desk3.amr.corp.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <155552637207.2015392.16917498971420465931.stgit@dwillia2-desk3.amr.corp.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Dan Williams Cc: Michal Hocko , linux-nvdimm@lists.01.org, David Hildenbrand , linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org List-ID: On Wed, Apr 17, 2019 at 11:39:32AM -0700, Dan Williams wrote: > Given there are no more usages of is_dev_zone() outside of 'ifdef > CONFIG_ZONE_DEVICE' protection, kill off the compilation helper. > > Cc: Michal Hocko > Cc: David Hildenbrand > Cc: Logan Gunthorpe > Signed-off-by: Dan Williams Reviewed-by: Oscar Salvador > --- > include/linux/mmzone.h | 12 ------------ > mm/page_alloc.c | 2 +- > 2 files changed, 1 insertion(+), 13 deletions(-) > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index b13f0cddf75e..3237c5e456df 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -855,18 +855,6 @@ static inline int local_memory_node(int node_id) { return node_id; }; > */ > #define zone_idx(zone) ((zone) - (zone)->zone_pgdat->node_zones) > > -#ifdef CONFIG_ZONE_DEVICE > -static inline bool is_dev_zone(const struct zone *zone) > -{ > - return zone_idx(zone) == ZONE_DEVICE; > -} > -#else > -static inline bool is_dev_zone(const struct zone *zone) > -{ > - return false; > -} > -#endif > - > /* > * Returns true if a zone has pages managed by the buddy allocator. > * All the reclaim decisions have to use this function rather than > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index c9ad28a78018..fd455bd742d5 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -5844,7 +5844,7 @@ void __ref memmap_init_zone_device(struct zone *zone, > unsigned long start = jiffies; > int nid = pgdat->node_id; > > - if (WARN_ON_ONCE(!pgmap || !is_dev_zone(zone))) > + if (WARN_ON_ONCE(!pgmap || zone_idx(zone) != ZONE_DEVICE)) > return; > > /* > -- Oscar Salvador SUSE L3 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm