diff --git a/[refs] b/[refs] index c55779f41483..3e6222bb1ac1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 821ed6bbed3cf41c4050a431eeb822b33868d36a +refs/heads/master: a3bc42f584cf9024580adeb4031d4202dac05858 diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c index 89b0391f14a8..9f646374e32f 100644 --- a/trunk/mm/memory_hotplug.c +++ b/trunk/mm/memory_hotplug.c @@ -374,10 +374,6 @@ void online_page(struct page *page) totalhigh_pages++; #endif -#ifdef CONFIG_FLATMEM - max_mapnr = max(pfn, max_mapnr); -#endif - ClearPageReserved(page); init_page_count(page); __free_page(page);