2013-08-09 00:44:59

by Joonyoung Shim

[permalink] [raw]
Subject: [PATCH v2] Revert "mm/memory-hotplug: fix lowmem count overflow when offline pages"

This reverts commit cea27eb2a202959783f81254c48c250ddd80e129
("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 <[email protected]>
Reviewed-by: Wanpeng Li <[email protected]>
---
Changes v1 -> v2:
- Update commit descriptions suggested by Bartlomiej.

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