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/sh64/mm/init.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/sh64/mm/init.c')
| -rw-r--r-- | arch/sh64/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh64/mm/init.c b/arch/sh64/mm/init.c index a65e8bb2c3cc..1169757fb38b 100644 --- a/arch/sh64/mm/init.c +++ b/arch/sh64/mm/init.c | |||
| @@ -173,7 +173,7 @@ void free_initmem(void) | |||
| 173 | addr = (unsigned long)(&__init_begin); | 173 | addr = (unsigned long)(&__init_begin); |
| 174 | for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { | 174 | for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { |
| 175 | ClearPageReserved(virt_to_page(addr)); | 175 | ClearPageReserved(virt_to_page(addr)); |
| 176 | set_page_count(virt_to_page(addr), 1); | 176 | init_page_count(virt_to_page(addr)); |
| 177 | free_page(addr); | 177 | free_page(addr); |
| 178 | totalram_pages++; | 178 | totalram_pages++; |
| 179 | } | 179 | } |
| @@ -186,7 +186,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
| 186 | unsigned long p; | 186 | unsigned long p; |
| 187 | for (p = start; p < end; p += PAGE_SIZE) { | 187 | for (p = start; p < end; p += PAGE_SIZE) { |
| 188 | ClearPageReserved(virt_to_page(p)); | 188 | ClearPageReserved(virt_to_page(p)); |
| 189 | set_page_count(virt_to_page(p), 1); | 189 | init_page_count(virt_to_page(p)); |
| 190 | free_page(p); | 190 | free_page(p); |
| 191 | totalram_pages++; | 191 | totalram_pages++; |
| 192 | } | 192 | } |
