From: Michal Hocko <mhocko@suse.cz>
Date: Thu, 27 Jun 2013 23:51:41 +0000 (+1000)
Subject: mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix
X-Git-Tag: next-20130628~3^2~523
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31f11a1c7ef8d1c6effe7286ba4689a57ed2a3f8;p=karo-tx-linux.git

mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages-fix

Fix CONFIG_HIGHMEM=n build

Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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);