Commit fcab1e51 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds

[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: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2e6e33ba
...@@ -1828,8 +1828,8 @@ void __flush_tlb_all(void) ...@@ -1828,8 +1828,8 @@ void __flush_tlb_all(void)
void online_page(struct page *page) void online_page(struct page *page)
{ {
ClearPageReserved(page); ClearPageReserved(page);
set_page_count(page, 0); init_page_count(page);
free_cold_page(page); __free_page(page);
totalram_pages++; totalram_pages++;
num_physpages++; num_physpages++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment