mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
memblock: s/memblock_analyze()/memblock_allow_resize()/ and update users
The only function of memblock_analyze() is now allowing resize of memblock region arrays. Rename it to memblock_allow_resize() and update its users. * The following users remain the same other than renaming. arm/mm/init.c::arm_memblock_init() microblaze/kernel/prom.c::early_init_devtree() powerpc/kernel/prom.c::early_init_devtree() openrisc/kernel/prom.c::early_init_devtree() sh/mm/init.c::paging_init() sparc/mm/init_64.c::paging_init() unicore32/mm/init.c::uc32_memblock_init() * In the following users, analyze was used to update total size which is no longer necessary. powerpc/kernel/machine_kexec.c::reserve_crashkernel() powerpc/kernel/prom.c::early_init_devtree() powerpc/mm/init_32.c::MMU_init() powerpc/mm/tlb_nohash.c::__early_init_mmu() powerpc/platforms/ps3/mm.c::ps3_mm_add_memory() powerpc/platforms/embedded6xx/wii.c::wii_memory_fixups() sh/kernel/machine_kexec.c::reserve_crashkernel() * x86/kernel/e820.c::memblock_x86_fill() was directly setting memblock_can_resize before populating memblock and calling analyze afterwards. Call memblock_allow_resize() before start populating. memblock_can_resize is now static inside memblock.c. Signed-off-by: Tejun Heo <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: Russell King <[email protected]> Cc: Michal Simek <[email protected]> Cc: Paul Mundt <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Guan Xuetao <[email protected]> Cc: "H. Peter Anvin" <[email protected]>
This commit is contained in:
parent
1440c4e2c9
commit
1aadc0560f
16 changed files with 11 additions and 26 deletions
|
|
@ -36,7 +36,7 @@ struct memblock memblock __initdata_memblock = {
|
|||
};
|
||||
|
||||
int memblock_debug __initdata_memblock;
|
||||
int memblock_can_resize __initdata_memblock;
|
||||
static int memblock_can_resize __initdata_memblock;
|
||||
|
||||
/* inline so we don't get a warning when pr_debug is compiled out */
|
||||
static inline const char *memblock_type_name(struct memblock_type *type)
|
||||
|
|
@ -918,9 +918,8 @@ void __init_memblock __memblock_dump_all(void)
|
|||
memblock_dump(&memblock.reserved, "reserved");
|
||||
}
|
||||
|
||||
void __init memblock_analyze(void)
|
||||
void __init memblock_allow_resize(void)
|
||||
{
|
||||
/* We allow resizing from there */
|
||||
memblock_can_resize = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue