The patch titled page allocator: update NR_FREE_PAGES only when necessary has been added to the -mm tree. Its filename is page-allocator-fix-update-nr_free_pages-only-as-necessary.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: page allocator: update NR_FREE_PAGES only when necessary From: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> commit f2260e6b (page allocator: update NR_FREE_PAGES only as necessary) made one minor regression. if __rmqueue() was failed, NR_FREE_PAGES stat go wrong. this patch fixes it. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Cc: Huang Shijie <shijie8@xxxxxxxxx> Reviewed-by : Minchan Kim <minchan.kim@xxxxxxxxx> Cc: Huang Shijie <shijie8@xxxxxxxxx> Reviewed-by: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx> Cc: <stable@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/page_alloc.c~page-allocator-fix-update-nr_free_pages-only-as-necessary mm/page_alloc.c --- a/mm/page_alloc.c~page-allocator-fix-update-nr_free_pages-only-as-necessary +++ a/mm/page_alloc.c @@ -1219,10 +1219,10 @@ again: } spin_lock_irqsave(&zone->lock, flags); page = __rmqueue(zone, order, migratetype); - __mod_zone_page_state(zone, NR_FREE_PAGES, -(1 << order)); spin_unlock(&zone->lock); if (!page) goto failed; + __mod_zone_page_state(zone, NR_FREE_PAGES, -(1 << order)); } __count_zone_vm_events(PGALLOC, zone, 1 << order); _ Patches currently in -mm which might be from kosaki.motohiro@xxxxxxxxxxxxxx are proc-revert-procfs-provide-stack-information-for-threads.patch smaps-fix-wrong-rss-count.patch linux-next.patch page-allocator-fix-update-nr_free_pages-only-as-necessary.patch mm-introduce-dump_page-and-print-symbolic-flag-names.patch mlock_vma_pages_range-never-return-negative-value.patch mlock_vma_pages_range-only-return-success-or-failure.patch prctl-add-pr_set_proctitle_area-option-for-prctl.patch mm-pass-mm-flags-as-a-coredump-parameter-for-consistency.patch fs-symlink-write_begin-allocation-context-fix-reiser4-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html