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/ia64/mm/init.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/ia64/mm/init.c')
| -rw-r--r-- | arch/ia64/mm/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index b38b6d213c15..08d94e6bfa18 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
| @@ -197,7 +197,7 @@ free_initmem (void) | |||
| 197 | eaddr = (unsigned long) ia64_imva(__init_end); | 197 | eaddr = (unsigned long) ia64_imva(__init_end); |
| 198 | while (addr < eaddr) { | 198 | while (addr < eaddr) { |
| 199 | ClearPageReserved(virt_to_page(addr)); | 199 | ClearPageReserved(virt_to_page(addr)); |
| 200 | set_page_count(virt_to_page(addr), 1); | 200 | init_page_count(virt_to_page(addr)); |
| 201 | free_page(addr); | 201 | free_page(addr); |
| 202 | ++totalram_pages; | 202 | ++totalram_pages; |
| 203 | addr += PAGE_SIZE; | 203 | addr += PAGE_SIZE; |
| @@ -252,7 +252,7 @@ free_initrd_mem (unsigned long start, unsigned long end) | |||
| 252 | continue; | 252 | continue; |
| 253 | page = virt_to_page(start); | 253 | page = virt_to_page(start); |
| 254 | ClearPageReserved(page); | 254 | ClearPageReserved(page); |
| 255 | set_page_count(page, 1); | 255 | init_page_count(page); |
| 256 | free_page(start); | 256 | free_page(start); |
| 257 | ++totalram_pages; | 257 | ++totalram_pages; |
| 258 | } | 258 | } |
| @@ -640,7 +640,7 @@ mem_init (void) | |||
| 640 | void online_page(struct page *page) | 640 | void online_page(struct page *page) |
| 641 | { | 641 | { |
| 642 | ClearPageReserved(page); | 642 | ClearPageReserved(page); |
| 643 | set_page_count(page, 1); | 643 | init_page_count(page); |
| 644 | __free_page(page); | 644 | __free_page(page); |
| 645 | totalram_pages++; | 645 | totalram_pages++; |
| 646 | num_physpages++; | 646 | num_physpages++; |
