Path: csiph.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod From: Mel Gorman Newsgroups: linux.kernel Subject: [PATCH 26/27] mm: vmstat: Replace __count_zone_vm_events with a zone id equivalent Date: Fri, 15 Apr 2016 11:20:03 +0200 Message-ID: References: X-Mailer: git-send-email 2.6.4 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 41 Organization: linux.* mail to news gateway X-Original-Cc: Rik van Riel , Vlastimil Babka , Johannes Weiner , Jesper Dangaard Brouer , LKML , Mel Gorman X-Original-Date: Fri, 15 Apr 2016 10:13:32 +0100 X-Original-Message-ID: <1460711613-2761-27-git-send-email-mgorman@techsingularity.net> X-Original-References: <1460711613-2761-1-git-send-email-mgorman@techsingularity.net> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1379600 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(). Signed-off-by: Mel Gorman --- include/linux/vmstat.h | 5 ++--- mm/page_alloc.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 24bca20ede8f..9360ef611f3e 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -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. diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d0ca26152716..c74d79d473df 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2656,7 +2656,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); -- 2.6.4