summaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2006-03-23 07:48:16 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-23 07:15:21 -0800
commitfcab1e51796d8bcd1a7969ff52bd904d38748e00 (patch)
treeed2429321d8d12e9ec93fa2c0aec31fdc3d7b267 /arch/sparc64
parent2e6e33bab6e1996a5dec9108fb467b52b841e7a8 (diff)
downloadblackbird-op-linux-fcab1e51796d8bcd1a7969ff52bd904d38748e00.tar.gz
blackbird-op-linux-fcab1e51796d8bcd1a7969ff52bd904d38748e00.zip
[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>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/mm/init.c4
1 files changed, 2 insertions, 2 deletions
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++;
}
OpenPOWER on IntegriCloud