Kaynağa Gözat

[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>
Nick Piggin 19 yıl önce
ebeveyn
işleme
fcab1e5179
1 değiştirilmiş dosya ile 2 ekleme ve 2 silme
  1. 2 2
      arch/sparc64/mm/init.c

+ 2 - 2
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++;
 }