aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/init.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-23 23:44:19 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-23 23:44:19 -0500
commit1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch)
treef5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /arch/sh/mm/init.c
parentac58c9059da8886b5e8cde012a80266b18ca146e (diff)
parent674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff)
Merge branch 'linus'
Diffstat (limited to 'arch/sh/mm/init.c')
-rw-r--r--arch/sh/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index e342565f75fb..77b4a838fe10 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -273,7 +273,7 @@ void free_initmem(void)
273 addr = (unsigned long)(&__init_begin); 273 addr = (unsigned long)(&__init_begin);
274 for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { 274 for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
275 ClearPageReserved(virt_to_page(addr)); 275 ClearPageReserved(virt_to_page(addr));
276 set_page_count(virt_to_page(addr), 1); 276 init_page_count(virt_to_page(addr));
277 free_page(addr); 277 free_page(addr);
278 totalram_pages++; 278 totalram_pages++;
279 } 279 }
@@ -286,7 +286,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
286 unsigned long p; 286 unsigned long p;
287 for (p = start; p < end; p += PAGE_SIZE) { 287 for (p = start; p < end; p += PAGE_SIZE) {
288 ClearPageReserved(virt_to_page(p)); 288 ClearPageReserved(virt_to_page(p));
289 set_page_count(virt_to_page(p), 1); 289 init_page_count(virt_to_page(p));
290 free_page(p); 290 free_page(p);
291 totalram_pages++; 291 totalram_pages++;
292 } 292 }