Commit 46d945ae authored Jul 18, 2019 by Dan Williams Committed by Linus Torvalds Jul 18, 2019

mm: kill is_dev_zone() helper

Given there are no more usages of is_dev_zone() outside of 'ifdef
CONFIG_ZONE_DEVICE' protection, kill off the compilation helper.

Link: http://lkml.kernel.org/r/156092353211.979959.1489004866360828964.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Wei Yang <richardw.yang@linux.intel.com>
Acked-by: David Hildenbrand <david@redhat.com>
Tested-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>	[ppc64]
Cc: Michal Hocko <mhocko@suse.com>
Cc: Logan Gunthorpe <logang@deltatee.com>
Cc: Jane Chu <jane.chu@oracle.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 96da4350

include/linux/mmzone.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -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

mm/page_alloc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5926,7 +5926,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;

		/*

Admin message