[21/89] page allocator: update NR_FREE_PAGES only when necessary
in [Kernel]
|
Prev: [37/89] x86/PCI/PAT: return EINVAL for pci mmap WC request for !pat_enabled
Next: [58/89] dnotify: ignore FS_EVENT_ON_CHILD
From: Greg KH on 30 Mar 2010 20:30 2.6.31-stable review patch. If anyone has any objections, please let us know. ------------------ From: KOSAKI Motohiro <kosaki.motohiro(a)jp.fujitsu.com> commit 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 upstream. 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(a)jp.fujitsu.com> Cc: Mel Gorman <mel(a)csn.ul.ie> Reviewed-by: Minchan Kim <minchan.kim(a)gmail.com> Reported-by: Huang Shijie <shijie8(a)gmail.com> Reviewed-by: Christoph Lameter <cl(a)linux-foundation.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1167,10 +1167,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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |