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/m32r/mm | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/m32r/mm')
| -rw-r--r-- | arch/m32r/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index 6facf15b04f3..c9e7dad860b7 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c | |||
| @@ -226,7 +226,7 @@ void free_initmem(void) | |||
| 226 | addr = (unsigned long)(&__init_begin); | 226 | addr = (unsigned long)(&__init_begin); |
| 227 | for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { | 227 | for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { |
| 228 | ClearPageReserved(virt_to_page(addr)); | 228 | ClearPageReserved(virt_to_page(addr)); |
| 229 | set_page_count(virt_to_page(addr), 1); | 229 | init_page_count(virt_to_page(addr)); |
| 230 | free_page(addr); | 230 | free_page(addr); |
| 231 | totalram_pages++; | 231 | totalram_pages++; |
| 232 | } | 232 | } |
| @@ -244,7 +244,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
| 244 | unsigned long p; | 244 | unsigned long p; |
| 245 | for (p = start; p < end; p += PAGE_SIZE) { | 245 | for (p = start; p < end; p += PAGE_SIZE) { |
| 246 | ClearPageReserved(virt_to_page(p)); | 246 | ClearPageReserved(virt_to_page(p)); |
| 247 | set_page_count(virt_to_page(p), 1); | 247 | init_page_count(virt_to_page(p)); |
| 248 | free_page(p); | 248 | free_page(p); |
| 249 | totalram_pages++; | 249 | totalram_pages++; |
| 250 | } | 250 | } |
