From 0289cb686f77ee94fb0c23ead86df3243c5e1fa6 Mon Sep 17 00:00:00 2001
From: Jiang Liu <liuj97@gmail.com>
Date: Mon, 29 Apr 2013 15:07:10 -0700
Subject: [PATCH] --- yaml --- r: 365387 b: refs/heads/master c:
 32e1a109276e96f4caec97305167260522476e4a h: refs/heads/master i:   365385:
 e3607f00d06da0a1df3aa030341118455c56e62a   365383:
 5bf097627ca99d5e71d8ca230e5302126f4eb637 v: v3

---
 [refs]                        |  2 +-
 trunk/arch/sparc/mm/init_32.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 0078cd6b4f04..271418548fc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7db6f78cfe683cb8ce508d6cecdfc6638ac35a3f
+refs/heads/master: 32e1a109276e96f4caec97305167260522476e4a
diff --git a/trunk/arch/sparc/mm/init_32.c b/trunk/arch/sparc/mm/init_32.c
index 48e0c030e8f5..4490c397bb5b 100644
--- a/trunk/arch/sparc/mm/init_32.c
+++ b/trunk/arch/sparc/mm/init_32.c
@@ -282,14 +282,8 @@ static void map_high_region(unsigned long start_pfn, unsigned long end_pfn)
 	printk("mapping high region %08lx - %08lx\n", start_pfn, end_pfn);
 #endif
 
-	for (tmp = start_pfn; tmp < end_pfn; tmp++) {
-		struct page *page = pfn_to_page(tmp);
-
-		ClearPageReserved(page);
-		init_page_count(page);
-		__free_page(page);
-		totalhigh_pages++;
-	}
+	for (tmp = start_pfn; tmp < end_pfn; tmp++)
+		free_highmem_page(pfn_to_page(tmp));
 }
 
 void __init mem_init(void)
@@ -347,8 +341,6 @@ void __init mem_init(void)
 		map_high_region(start_pfn, end_pfn);
 	}
 	
-	totalram_pages += totalhigh_pages;
-
 	codepages = (((unsigned long) &_etext) - ((unsigned long)&_start));
 	codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
 	datapages = (((unsigned long) &_edata) - ((unsigned long)&_etext));