From fcab1e51796d8bcd1a7969ff52bd904d38748e00 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Thu, 23 Mar 2006 07:48:16 +0100 Subject: [PATCH] [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 Signed-off-by: Linus Torvalds --- arch/sparc64/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index ded63ee..1539a83 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++; } -- 2.7.4