aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/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/m68knommu/mm/init.c
parentac58c9059da8886b5e8cde012a80266b18ca146e (diff)
parent674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff)
Merge branch 'linus'
Diffstat (limited to 'arch/m68knommu/mm/init.c')
-rw-r--r--arch/m68knommu/mm/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c
index 89f0b554ffb7..d79503fe6e42 100644
--- a/arch/m68knommu/mm/init.c
+++ b/arch/m68knommu/mm/init.c
@@ -195,7 +195,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
195 int pages = 0; 195 int pages = 0;
196 for (; start < end; start += PAGE_SIZE) { 196 for (; start < end; start += PAGE_SIZE) {
197 ClearPageReserved(virt_to_page(start)); 197 ClearPageReserved(virt_to_page(start));
198 set_page_count(virt_to_page(start), 1); 198 init_page_count(virt_to_page(start));
199 free_page(start); 199 free_page(start);
200 totalram_pages++; 200 totalram_pages++;
201 pages++; 201 pages++;
@@ -218,7 +218,7 @@ free_initmem()
218 /* next to check that the page we free is not a partial page */ 218 /* next to check that the page we free is not a partial page */
219 for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) { 219 for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) {
220 ClearPageReserved(virt_to_page(addr)); 220 ClearPageReserved(virt_to_page(addr));
221 set_page_count(virt_to_page(addr), 1); 221 init_page_count(virt_to_page(addr));
222 free_page(addr); 222 free_page(addr);
223 totalram_pages++; 223 totalram_pages++;
224 } 224 }