On 01/17/2017 07:07 PM, Jesper Dangaard Brouer wrote: > > On Tue, 17 Jan 2017 09:29:51 +0000 Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> wrote: > >> +/* Lock and remove page from the per-cpu list */ >> +static struct page *rmqueue_pcplist(struct zone *preferred_zone, >> + struct zone *zone, unsigned int order, >> + gfp_t gfp_flags, int migratetype) >> +{ >> + struct per_cpu_pages *pcp; >> + struct list_head *list; >> + bool cold = ((gfp_flags & __GFP_COLD) != 0); >> + struct page *page; >> + unsigned long flags; >> + >> + local_irq_save(flags); >> + pcp = &this_cpu_ptr(zone->pageset)->pcp; >> + list = &pcp->lists[migratetype]; >> + page = __rmqueue_pcplist(zone, migratetype, cold, pcp, list); >> + if (page) { >> + __count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order); >> + zone_statistics(preferred_zone, zone, gfp_flags); > > Word-of-warning: The zone_statistics() call changed number of > parameters in commit 41b6167e8f74 ("mm: get rid of __GFP_OTHER_NODE"). > (Not sure what tree you are based on) Yeah and there will likely be more conflicts with fixes wrt the "getting oom/stalls for ltp test cpuset01 with latest/4.9 kernel" thread, hopefully tomorrow. >> + } >> + local_irq_restore(flags); >> + return page; >> +} > > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>