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/sparc/mm/init.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/sparc/mm/init.c')
| -rw-r--r-- | arch/sparc/mm/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index c03babaa0498..898669732466 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c | |||
| @@ -383,7 +383,7 @@ void map_high_region(unsigned long start_pfn, unsigned long end_pfn) | |||
| 383 | struct page *page = pfn_to_page(tmp); | 383 | struct page *page = pfn_to_page(tmp); |
| 384 | 384 | ||
| 385 | ClearPageReserved(page); | 385 | ClearPageReserved(page); |
| 386 | set_page_count(page, 1); | 386 | init_page_count(page); |
| 387 | __free_page(page); | 387 | __free_page(page); |
| 388 | totalhigh_pages++; | 388 | totalhigh_pages++; |
| 389 | } | 389 | } |
| @@ -480,7 +480,7 @@ void free_initmem (void) | |||
| 480 | p = virt_to_page(addr); | 480 | p = virt_to_page(addr); |
| 481 | 481 | ||
| 482 | ClearPageReserved(p); | 482 | ClearPageReserved(p); |
| 483 | set_page_count(p, 1); | 483 | init_page_count(p); |
| 484 | __free_page(p); | 484 | __free_page(p); |
| 485 | totalram_pages++; | 485 | totalram_pages++; |
| 486 | num_physpages++; | 486 | num_physpages++; |
| @@ -497,7 +497,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
| 497 | struct page *p = virt_to_page(start); | 497 | struct page *p = virt_to_page(start); |
| 498 | 498 | ||
| 499 | ClearPageReserved(p); | 499 | ClearPageReserved(p); |
| 500 | set_page_count(p, 1); | 500 | init_page_count(p); |
| 501 | __free_page(p); | 501 | __free_page(p); |
| 502 | num_physpages++; | 502 | num_physpages++; |
| 503 | } | 503 | } |
