From: Nick Piggin <npiggin@suse.de>
Date: Thu, 23 Mar 2006 06:48:16 +0000 (+0100)
Subject: [PATCH] sparc64: fix set_page_count merge clash
X-Git-Tag: v2.6.17-rc1~1116
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fcab1e51796d8bcd1a7969ff52bd904d38748e00;p=karo-tx-linux.git

[PATCH] sparc64: fix set_page_count merge clash

Merge clash will have broken sparc64. Synch up its online_page
implementation with powerpc, which was identical until the
set_page_count removal.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index ded63ee9c4fd..1539a8362b6f 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -1828,8 +1828,8 @@ void __flush_tlb_all(void)
 void online_page(struct page *page)
 {
 	ClearPageReserved(page);
-	set_page_count(page, 0);
-	free_cold_page(page);
+	init_page_count(page);
+	__free_page(page);
 	totalram_pages++;
 	num_physpages++;
 }