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

Commit 16709d1d authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm: vmstat: replace __count_zone_vm_events with a zone id equivalent 

This is partially a preparation patch for more vmstat work but it also
has the slight advantage that __count_zid_vm_events is cheaper to
calculate than __count_zone_vm_events().

Link: http://lkml.kernel.org/r/1467970510-21195-32-git-send-email-mgorman@techsingularity.net


Signed-off-by: default avatarMel Gorman <mgorman@techsingularity.net>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3b8c0be4

include/linux/vmstat.h

+2 −3
Original line number Diff line number Diff line
@@ -101,9 +101,8 @@ static inline void vm_events_fold_cpu(int cpu) 
#define count_vm_vmacache_event(x) do {} while (0)

#endif



#define __count_zone_vm_events(item, zone, delta) \

		__count_vm_events(item##_NORMAL - ZONE_NORMAL + \

		zone_idx(zone), delta)

#define __count_zid_vm_events(item, zid, delta) \

	__count_vm_events(item##_NORMAL - ZONE_NORMAL + zid, delta)



/*

 * Zone and node-based page accounting with per cpu differentials.

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -2616,7 +2616,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, 
					  get_pcppage_migratetype(page));

	}



	__count_zone_vm_events(PGALLOC, zone, 1 << order);

	__count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);

	zone_statistics(preferred_zone, zone, gfp_flags);

	local_irq_restore(flags);