|
@@ -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.
|