[PATCH] sparc64: fix set_page_count merge clash
authorNick Piggin <npiggin@suse.de>
Thu, 23 Mar 2006 06:48:16 +0000 (07:48 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 23 Mar 2006 15:15:21 +0000 (07:15 -0800)
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>
arch/sparc64/mm/init.c

index ded63ee9c4fd4376b8c3e81c172ed65b516c7555..1539a8362b6f564bc3e49d9ba01f94827d012063 100644 (file)
@@ -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++;
 }