From: Andrew Morton Date: Fri, 28 Sep 2012 00:19:39 +0000 (+1000) Subject: cma-count-free-cma-pages-fix X-Git-Tag: next-20121004~1^2~264 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6113135472d8863d14ea4763fd2cbc2b76e30ff8;p=karo-tx-linux.git cma-count-free-cma-pages-fix use conventional migratetype naming Cc: Bartlomiej Zolnierkiewicz Cc: Hugh Dickins Cc: Kyungmin Park Cc: Marek Szyprowski Cc: Mel Gorman Cc: Michal Nazarewicz Cc: Minchan Kim Signed-off-by: Andrew Morton --- diff --git a/mm/page_isolation.c b/mm/page_isolation.c index bce97c93451f..345643b85bd4 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -77,12 +77,12 @@ int set_migratetype_isolate(struct page *page) out: if (!ret) { unsigned long nr_pages; - int mt = get_pageblock_migratetype(page); + int migratetype = get_pageblock_migratetype(page); set_pageblock_isolate(page); nr_pages = move_freepages_block(zone, page, MIGRATE_ISOLATE); - __mod_zone_freepage_state(zone, -nr_pages, mt); + __mod_zone_freepage_state(zone, -nr_pages, migratetype); } spin_unlock_irqrestore(&zone->lock, flags);