aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mm/init.c
diff options
context:
space:
mode:
authorFranck Bui-Huu <vagabon.xyz@gmail.com>2006-10-19 07:19:59 -0400
committerRalf Baechle <ralf@linux-mips.org>2006-11-29 20:14:40 -0500
commit99e3b942c62f42c8d5added63305e12372b06daf (patch)
tree53878461941bf05a4c17653ddfc40362cfcb9738 /arch/mips/mm/init.c
parent0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff)
[MIPS] page.h: remove __pa() usages.
__pa() was used by virt_to_page() and virt_addr_valid(). These latter are used when kernel is initialised so __pa() is not appropriate, we use virt_to_phys() instead. Futhermore __pa() is going to take care of CKSEG0/XKPHYS address mix for 64 bit kernels. This makes __pa() more complex than virt_to_phys() and this extra work is not needed by virt_to_page() and virt_addr_valid(). Eventually it consolidates virt_to_phys() prototype by making its argument 'const'. this avoids some warnings that was due to some virt_to_page() usages which pass const pointer. Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/init.c')
-rw-r--r--arch/mips/mm/init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 2de4d3c367a2..304991263f6b 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -90,9 +90,9 @@ unsigned long setup_zero_pages(void)
90 if (!empty_zero_page) 90 if (!empty_zero_page)
91 panic("Oh boy, that early out of memory?"); 91 panic("Oh boy, that early out of memory?");
92 92
93 page = virt_to_page(empty_zero_page); 93 page = virt_to_page((void *)empty_zero_page);
94 split_page(page, order); 94 split_page(page, order);
95 while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { 95 while (page < virt_to_page((void *)(empty_zero_page + (PAGE_SIZE << order)))) {
96 SetPageReserved(page); 96 SetPageReserved(page);
97 page++; 97 page++;
98 } 98 }
@@ -448,8 +448,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
448 unsigned long addr; 448 unsigned long addr;
449 449
450 for (addr = begin; addr < end; addr += PAGE_SIZE) { 450 for (addr = begin; addr < end; addr += PAGE_SIZE) {
451 ClearPageReserved(virt_to_page(addr)); 451 ClearPageReserved(virt_to_page((void *)addr));
452 init_page_count(virt_to_page(addr)); 452 init_page_count(virt_to_page((void *)addr));
453 memset((void *)addr, 0xcc, PAGE_SIZE); 453 memset((void *)addr, 0xcc, PAGE_SIZE);
454 free_page(addr); 454 free_page(addr);
455 totalram_pages++; 455 totalram_pages++;