diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /arch/h8300/mm/init.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/h8300/mm/init.c')
| -rw-r--r-- | arch/h8300/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c index 1e0929ddc8c4..09efc4b1f038 100644 --- a/arch/h8300/mm/init.c +++ b/arch/h8300/mm/init.c | |||
| @@ -196,7 +196,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
| 196 | int pages = 0; | 196 | int pages = 0; |
| 197 | for (; start < end; start += PAGE_SIZE) { | 197 | for (; start < end; start += PAGE_SIZE) { |
| 198 | ClearPageReserved(virt_to_page(start)); | 198 | ClearPageReserved(virt_to_page(start)); |
| 199 | set_page_count(virt_to_page(start), 1); | 199 | init_page_count(virt_to_page(start)); |
| 200 | free_page(start); | 200 | free_page(start); |
| 201 | totalram_pages++; | 201 | totalram_pages++; |
| 202 | pages++; | 202 | pages++; |
| @@ -219,7 +219,7 @@ free_initmem() | |||
| 219 | /* next to check that the page we free is not a partial page */ | 219 | /* next to check that the page we free is not a partial page */ |
| 220 | for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) { | 220 | for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) { |
| 221 | ClearPageReserved(virt_to_page(addr)); | 221 | ClearPageReserved(virt_to_page(addr)); |
| 222 | set_page_count(virt_to_page(addr), 1); | 222 | init_page_count(virt_to_page(addr)); |
| 223 | free_page(addr); | 223 | free_page(addr); |
| 224 | totalram_pages++; | 224 | totalram_pages++; |
| 225 | } | 225 | } |
