This reverts commit cea27eb2a202959783f81254c48c250ddd80e129. Fixed to adjust totalhigh_pages when hot-removing memory by commit 3dcc0571cd64816309765b7c7e4691a4cadf2ee7, so that commit occurs duplicated decreasing of totalhigh_pages.
Signed-off-by: Joonyoung Shim <[email protected]> --- The commit cea27eb2a202959783f81254c48c250ddd80e129 is only for stable, is it right? mm/page_alloc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b100255..2b28216 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6274,10 +6274,6 @@ __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn) 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); -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
