Skip to content

Commit

Permalink
[MIPS] setup.c: get ride of CPHYSADDR()
Browse files Browse the repository at this point in the history
and use new __pa() implementation instead introduced by the previous
patch. Indeed this macro can be used now even by the 64 bit kernels
with CONFIG_BUILD_ELF64=n config.

Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Franck Bui-Huu authored and Ralf Baechle committed Nov 30, 2006
1 parent 620a480 commit d4df6d4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/mips/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,12 @@ static void __init finalize_initrd(void)
printk(KERN_INFO "Initrd not found or empty");
goto disable;
}
if (CPHYSADDR(initrd_end) > PFN_PHYS(max_low_pfn)) {
if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) {
printk("Initrd extends beyond end of memory");
goto disable;
}

reserve_bootmem(CPHYSADDR(initrd_start), size);
reserve_bootmem(__pa(initrd_start), size);
initrd_below_start_ok = 1;

printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n",
Expand Down Expand Up @@ -260,7 +260,7 @@ static void __init bootmem_init(void)
* of usable memory.
*/
reserved_end = init_initrd();
reserved_end = PFN_UP(CPHYSADDR(max(reserved_end, (unsigned long)&_end)));
reserved_end = PFN_UP(__pa(max(reserved_end, (unsigned long)&_end)));

/*
* Find the highest page frame number we have available.
Expand Down

0 comments on commit d4df6d4

Please sign in to comment.