lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] sparc64: fix set_page_count merge clash

Browse Source 
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>
This commit is contained in:
Nick Piggin
2006-03-23 07:48:16 +01:00
committed by Linus Torvalds
parent 2e6e33bab6
commit fcab1e5179
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc64/mm/init.c
View File

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