mirror of
https://github.com/raspberrypi/linux.git
synced 2026-01-03 08:14:12 +00:00
MIPS: replace add_memory_region with memblock
add_memory_region was the old interface for registering memory and was already changed to used memblock internaly. Replace it by directly calling memblock functions. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
@@ -114,16 +114,14 @@ static __init void prom_meminit(void)
|
||||
if (initrd_start) {
|
||||
if ((initrd_pstart > addr) &&
|
||||
(initrd_pstart < (addr + size))) {
|
||||
add_memory_region(addr,
|
||||
initrd_pstart - addr,
|
||||
BOOT_MEM_RAM);
|
||||
memblock_add(addr,
|
||||
initrd_pstart - addr);
|
||||
rd_flag = 1;
|
||||
}
|
||||
if ((initrd_pend > addr) &&
|
||||
(initrd_pend < (addr + size))) {
|
||||
add_memory_region(initrd_pend,
|
||||
(addr + size) - initrd_pend,
|
||||
BOOT_MEM_RAM);
|
||||
memblock_add(initrd_pend,
|
||||
(addr + size) - initrd_pend);
|
||||
rd_flag = 1;
|
||||
}
|
||||
}
|
||||
@@ -142,7 +140,7 @@ static __init void prom_meminit(void)
|
||||
*/
|
||||
if (size > 512)
|
||||
size -= 512;
|
||||
add_memory_region(addr, size, BOOT_MEM_RAM);
|
||||
memblock_add(addr, size);
|
||||
}
|
||||
board_mem_region_addrs[board_mem_region_count] = addr;
|
||||
board_mem_region_sizes[board_mem_region_count] = size;
|
||||
@@ -158,8 +156,8 @@ static __init void prom_meminit(void)
|
||||
}
|
||||
#ifdef CONFIG_BLK_DEV_INITRD
|
||||
if (initrd_start) {
|
||||
add_memory_region(initrd_pstart, initrd_pend - initrd_pstart,
|
||||
BOOT_MEM_RESERVED);
|
||||
memblock_add(initrd_pstart, initrd_pend - initrd_pstart);
|
||||
memblock_reserve(initrd_pstart, initrd_pend - initrd_pstart);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user