diff options
| author |   Franck Bui-Huu <vagabon.xyz@gmail.com> | 2006-10-19 13:20:01 +0200 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2006-11-30 01:14:41 +0000 |
| commit | d4df6d4e7a66b7a9bd57f5dc7d80d6b55dc12dbb (patch) | |
| tree | 0f4a47863f390cfe9e65e7a6bd9e4933827339eb /arch | |
| parent | [MIPS] Make __pa() aware of XKPHYS/CKSEG0 address mix for 64 bit kernels (diff) | |
| download | linux-dev-d4df6d4e7a66b7a9bd57f5dc7d80d6b55dc12dbb.tar.xz linux-dev-d4df6d4e7a66b7a9bd57f5dc7d80d6b55dc12dbb.zip | |
[MIPS] setup.c: get ride of CPHYSADDR()
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8f6e89697ccf..715451a9d5d6 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -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", @@ -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. |