From 74cf520881ca36cba924df87bd624a265d8a255b Mon Sep 17 00:00:00 2001
From: Daniel Kiper <dkiper@net-space.pl>
Date: Tue, 24 May 2011 17:12:31 -0700
Subject: [PATCH] --- yaml --- r: 250919 b: refs/heads/master c:
 a3bc42f584cf9024580adeb4031d4202dac05858 h: refs/heads/master i:   250917:
 bf8672d41501fc5aa4f62fda4c99d86e98a0690b   250915:
 81d28c58e7c92d2ac71bf0895ab5406699417256   250911:
 4520d5b3104970a7b916bb0a92311e77fec9c3b6 v: v3

---
 [refs]                    | 2 +-
 trunk/mm/memory_hotplug.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

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