diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
| commit | f01c18456993bab43067b678f56c87ca954aa43b (patch) | |
| tree | 3e0cd0cdf1a57618202b46a7126125902e3ab832 /arch/ia64/mm/init.c | |
| parent | 949ec2c8e6b7b89179b85baf6309c009e1a1b951 (diff) | |
| parent | 1c2e02750b992703a8a18634e08b04353face243 (diff) | |
Merge branch 'master'
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++; |
