Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89696701 authored by Oscar Salvador's avatar Oscar Salvador Committed by Linus Torvalds
Browse files

mm: remove zone_id() and make use of zone_idx() in is_dev_zone() 

is_dev_zone() is using zone_id() to check if the zone is ZONE_DEVICE.
zone_id() looks pretty much the same as zone_idx(), and while the use of
zone_idx() is quite spread in the kernel, zone_id() is only being used by
is_dev_zone().

This patch removes zone_id() and makes is_dev_zone() use zone_idx() to
check the zone, so we do not have two things with the same functionality
around.

Link: http://lkml.kernel.org/r/20180730133718.28683-1-osalvador@techadventures.net


Signed-off-by: default avatarOscar Salvador <osalvador@suse.de>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarPavel Tatashin <pasha.tatashin@oracle.com>
Cc: Pasha Tatashin <Pavel.Tatashin@microsoft.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 85f237a5

include/linux/mmzone.h

+12 −19
Original line number Diff line number Diff line
@@ -755,25 +755,6 @@ static inline bool pgdat_is_empty(pg_data_t *pgdat) 
	return !pgdat->node_start_pfn && !pgdat->node_spanned_pages;

}



static inline int zone_id(const struct zone *zone)

{

	struct pglist_data *pgdat = zone->zone_pgdat;



	return zone - pgdat->node_zones;

}



#ifdef CONFIG_ZONE_DEVICE

static inline bool is_dev_zone(const struct zone *zone)

{

	return zone_id(zone) == ZONE_DEVICE;

}

#else

static inline bool is_dev_zone(const struct zone *zone)

{

	return false;

}

#endif



#include <linux/memory_hotplug.h>



void build_all_zonelists(pg_data_t *pgdat);
@@ -824,6 +805,18 @@ 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