aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFranck Bui-Huu <vagabon.xyz@gmail.com>2006-10-19 07:20:01 -0400
committerRalf Baechle <ralf@linux-mips.org>2006-11-29 20:14:41 -0500
commitd4df6d4e7a66b7a9bd57f5dc7d80d6b55dc12dbb (patch)
tree0f4a47863f390cfe9e65e7a6bd9e4933827339eb /arch
parent620a4802be8ee7989b1b6684b7198ebae02af854 (diff)
[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.c6
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)
204 printk(KERN_INFO "Initrd not found or empty"); 204 printk(KERN_INFO "Initrd not found or empty");
205 goto disable; 205 goto disable;
206 } 206 }
207 if (CPHYSADDR(initrd_end) > PFN_PHYS(max_low_pfn)) { 207 if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) {
208 printk("Initrd extends beyond end of memory"); 208 printk("Initrd extends beyond end of memory");
209 goto disable; 209 goto disable;
210 } 210 }
211 211
212 reserve_bootmem(CPHYSADDR(initrd_start), size); 212 reserve_bootmem(__pa(initrd_start), size);
213 initrd_below_start_ok = 1; 213 initrd_below_start_ok = 1;
214 214
215 printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n", 215 printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n",
@@ -260,7 +260,7 @@ static void __init bootmem_init(void)
260 * of usable memory. 260 * of usable memory.
261 */ 261 */
262 reserved_end = init_initrd(); 262 reserved_end = init_initrd();
263 reserved_end = PFN_UP(CPHYSADDR(max(reserved_end, (unsigned long)&_end))); 263 reserved_end = PFN_UP(__pa(max(reserved_end, (unsigned long)&_end)));
264 264
265 /* 265 /*
266 * Find the highest page frame number we have available. 266 * Find the highest page frame number we have available.