git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git]
/
arch
/
sparc64
/
mm
/
init.c
diff --git
a/arch/sparc64/mm/init.c
b/arch/sparc64/mm/init.c
index ded63ee9c4fd4376b8c3e81c172ed65b516c7555..1539a8362b6f564bc3e49d9ba01f94827d012063 100644
(file)
--- 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++;
}