On 17.04.19 20:39, 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 <[email protected]> > Cc: David Hildenbrand <[email protected]> > Cc: Logan Gunthorpe <[email protected]> > Signed-off-by: Dan Williams <[email protected]> > --- > 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; > > /* >
I like seeing that go Acked-by: David Hildenbrand <[email protected]> -- Thanks, David / dhildenb _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
