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/ppc/mm/init.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/ppc/mm/init.c')
| -rw-r--r-- | arch/ppc/mm/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c index 134db5c04203..cb1c294fb932 100644 --- a/arch/ppc/mm/init.c +++ b/arch/ppc/mm/init.c | |||
| @@ -140,7 +140,7 @@ static void free_sec(unsigned long start, unsigned long end, const char *name) | |||
| 140 | 140 | ||
| 141 | while (start < end) { | 141 | while (start < end) { |
| 142 | ClearPageReserved(virt_to_page(start)); | 142 | ClearPageReserved(virt_to_page(start)); |
| 143 | set_page_count(virt_to_page(start), 1); | 143 | init_page_count(virt_to_page(start)); |
| 144 | free_page(start); | 144 | free_page(start); |
| 145 | cnt++; | 145 | cnt++; |
| 146 | start += PAGE_SIZE; | 146 | start += PAGE_SIZE; |
| @@ -172,7 +172,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
| 172 | 172 | ||
| 173 | for (; start < end; start += PAGE_SIZE) { | 173 | for (; start < end; start += PAGE_SIZE) { |
| 174 | ClearPageReserved(virt_to_page(start)); | 174 | ClearPageReserved(virt_to_page(start)); |
| 175 | set_page_count(virt_to_page(start), 1); | 175 | init_page_count(virt_to_page(start)); |
| 176 | free_page(start); | 176 | free_page(start); |
| 177 | totalram_pages++; | 177 | totalram_pages++; |
| 178 | } | 178 | } |
| @@ -441,7 +441,7 @@ void __init mem_init(void) | |||
| 441 | struct page *page = mem_map + pfn; | 441 | struct page *page = mem_map + pfn; |
| 442 | 442 | ||
| 443 | ClearPageReserved(page); | 443 | ClearPageReserved(page); |
| 444 | set_page_count(page, 1); | 444 | init_page_count(page); |
| 445 | __free_page(page); | 445 | __free_page(page); |
| 446 | totalhigh_pages++; | 446 | totalhigh_pages++; |
| 447 | } | 447 | } |
