Subject: [merged] revert-mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages.patch removed from -mm tree To: jy0922.shim@xxxxxxxxxxx,b.zolnierkie@xxxxxxxxxxx,kosaki.motohiro@xxxxxxxxxxxxxx,liuj97@xxxxxxxxx,liwanp@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 17 Oct 2013 11:12:06 -0700 The patch titled Subject: revert "mm/memory-hotplug: fix lowmem count overflow when offline pages" has been removed from the -mm tree. Its filename was revert-mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Joonyoung Shim <jy0922.shim@xxxxxxxxxxx> Subject: revert "mm/memory-hotplug: fix lowmem count overflow when offline pages" This reverts commit cea27eb2a202 ("mm/memory-hotplug: fix lowmem count overflow when offline pages"). The fixed bug by commit cea27eb was fixed to another way by commit 3dcc057 ("mm: correctly update zone->managed_pages"). The commit 3dcc057 enhances memory_hotplug.c to adjust totalhigh_pages when hot-removing memory, for details please refer to: http://marc.info/?l=linux-mm&m=136957578620221&w=2 So, if not revert commit cea27eb, currently causes duplicated decreasing of totalhigh_pages. Signed-off-by: Joonyoung Shim <jy0922.shim@xxxxxxxxxxx> Reviewed-by: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Cc: Jiang Liu <liuj97@xxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN mm/page_alloc.c~revert-mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages mm/page_alloc.c --- a/mm/page_alloc.c~revert-mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages +++ a/mm/page_alloc.c @@ -6366,10 +6366,6 @@ __offline_isolated_pages(unsigned long s list_del(&page->lru); rmv_page_order(page); zone->free_area[order].nr_free--; -#ifdef CONFIG_HIGHMEM - if (PageHighMem(page)) - totalhigh_pages -= 1 << order; -#endif for (i = 0; i < (1 << order); i++) SetPageReserved((page+i)); pfn += (1 << order); _ Patches currently in -mm which might be from jy0922.shim@xxxxxxxxxxx are -- 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