From: Michal Hocko Date: Wed, 19 Jun 2013 00:06:14 +0000 (+1000) Subject: mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix X-Git-Tag: next-20130619~2^2~489 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eb75ca23302bed7303938529993f66444c70fd2e;p=karo-tx-linux.git mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix Fix CONFIG_HIGHMEM=n build Cc: Wanpeng Li Cc: Michal Hocko Cc: KAMEZAWA Hiroyuki Cc: David Rientjes Signed-off-by: Andrew Morton --- diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6f623f6d5c84..d711dcdda362 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6185,8 +6185,10 @@ __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);