mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00: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 <tj@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Michal Simek <monstr@monstr.eu> Cc: Paul Mundt <lethal@linux-sh.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Cc: "H. Peter Anvin" <hpa@zytor.com>
This commit is contained in:
parent
1440c4e2c9
commit
1aadc0560f
|
@ -371,7 +371,7 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
|
|||
if (mdesc->reserve)
|
||||
mdesc->reserve();
|
||||
|
||||
memblock_analyze();
|
||||
memblock_allow_resize();
|
||||
memblock_dump_all();
|
||||
}
|
||||
|
||||
|
|
|
@ -129,7 +129,7 @@ void __init early_init_devtree(void *params)
|
|||
strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
|
||||
parse_early_param();
|
||||
|
||||
memblock_analyze();
|
||||
memblock_allow_resize();
|
||||
|
||||
pr_debug("Phys. mem: %lx\n", (unsigned long) memblock_phys_mem_size());
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ void __init early_init_devtree(void *params)
|
|||
/* Save command line for /proc/cmdline and then parse parameters */
|
||||
strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
|
||||
|
||||
memblock_analyze();
|
||||
memblock_allow_resize();
|
||||
|
||||
/* We must copy the flattend device tree from init memory to regular
|
||||
* memory because the device tree references the strings in it
|
||||
|
|
|
@ -107,9 +107,6 @@ void __init reserve_crashkernel(void)
|
|||
unsigned long long crash_size, crash_base;
|
||||
int ret;
|
||||
|
||||
/* this is necessary because of memblock_phys_mem_size() */
|
||||
memblock_analyze();
|
||||
|
||||
/* use common parsing */
|
||||
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
|
||||
&crash_size, &crash_base);
|
||||
|
|
|
@ -758,11 +758,10 @@ void __init early_init_devtree(void *params)
|
|||
* Ensure that total memory size is page-aligned, because otherwise
|
||||
* mark_bootmem() gets upset.
|
||||
*/
|
||||
memblock_analyze();
|
||||
limit = ALIGN(memory_limit ?: memblock_phys_mem_size(), PAGE_SIZE);
|
||||
memblock_enforce_memory_limit(limit);
|
||||
|
||||
memblock_analyze();
|
||||
memblock_allow_resize();
|
||||
memblock_dump_all();
|
||||
|
||||
DBG("Phys. mem: %llx\n", memblock_phys_mem_size());
|
||||
|
|
|
@ -135,7 +135,6 @@ void __init MMU_init(void)
|
|||
if (memblock.memory.cnt > 1) {
|
||||
#ifndef CONFIG_WII
|
||||
memblock_enforce_memory_limit(memblock.memory.regions[0].size);
|
||||
memblock_analyze();
|
||||
printk(KERN_WARNING "Only using first contiguous memory region");
|
||||
#else
|
||||
wii_memory_fixups();
|
||||
|
@ -158,7 +157,6 @@ void __init MMU_init(void)
|
|||
#ifndef CONFIG_HIGHMEM
|
||||
total_memory = total_lowmem;
|
||||
memblock_enforce_memory_limit(total_lowmem);
|
||||
memblock_analyze();
|
||||
#endif /* CONFIG_HIGHMEM */
|
||||
}
|
||||
|
||||
|
|
|
@ -615,7 +615,6 @@ static void __early_init_mmu(int boot_cpu)
|
|||
|
||||
/* limit memory so we dont have linear faults */
|
||||
memblock_enforce_memory_limit(linear_map_top);
|
||||
memblock_analyze();
|
||||
|
||||
patch_exception(0x1c0, exc_data_tlb_miss_bolted_book3e);
|
||||
patch_exception(0x1e0, exc_instruction_tlb_miss_bolted_book3e);
|
||||
|
|
|
@ -88,7 +88,6 @@ void __init wii_memory_fixups(void)
|
|||
wii_hole_size = p[1].base - wii_hole_start;
|
||||
memblock_add(wii_hole_start, wii_hole_size);
|
||||
memblock_reserve(wii_hole_start, wii_hole_size);
|
||||
memblock_analyze();
|
||||
|
||||
BUG_ON(memblock.memory.cnt != 1);
|
||||
__memblock_dump_all();
|
||||
|
|
|
@ -319,7 +319,6 @@ static int __init ps3_mm_add_memory(void)
|
|||
}
|
||||
|
||||
memblock_add(start_addr, map.r1.size);
|
||||
memblock_analyze();
|
||||
|
||||
result = online_pages(start_pfn, nr_pages);
|
||||
|
||||
|
|
|
@ -157,9 +157,6 @@ void __init reserve_crashkernel(void)
|
|||
unsigned long long crash_size, crash_base;
|
||||
int ret;
|
||||
|
||||
/* this is necessary because of memblock_phys_mem_size() */
|
||||
memblock_analyze();
|
||||
|
||||
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
|
||||
&crash_size, &crash_base);
|
||||
if (ret == 0 && crash_size > 0) {
|
||||
|
|
|
@ -336,7 +336,7 @@ void __init paging_init(void)
|
|||
sh_mv.mv_mem_reserve();
|
||||
|
||||
memblock_enforce_memory_limit(memory_limit);
|
||||
memblock_analyze();
|
||||
memblock_allow_resize();
|
||||
|
||||
memblock_dump_all();
|
||||
|
||||
|
|
|
@ -1794,7 +1794,7 @@ void __init paging_init(void)
|
|||
|
||||
memblock_enforce_memory_limit(cmdline_memory_size);
|
||||
|
||||
memblock_analyze();
|
||||
memblock_allow_resize();
|
||||
memblock_dump_all();
|
||||
|
||||
set_bit(0, mmu_context_bmap);
|
||||
|
|
|
@ -264,7 +264,7 @@ void __init uc32_memblock_init(struct meminfo *mi)
|
|||
|
||||
uc32_mm_memblock_reserve();
|
||||
|
||||
memblock_analyze();
|
||||
memblock_allow_resize();
|
||||
memblock_dump_all();
|
||||
}
|
||||
|
||||
|
|
|
@ -1072,7 +1072,7 @@ void __init memblock_x86_fill(void)
|
|||
* We are safe to enable resizing, beause memblock_x86_fill()
|
||||
* is rather later for x86
|
||||
*/
|
||||
memblock_can_resize = 1;
|
||||
memblock_allow_resize();
|
||||
|
||||
for (i = 0; i < e820.nr_map; i++) {
|
||||
struct e820entry *ei = &e820.map[i];
|
||||
|
@ -1087,7 +1087,6 @@ void __init memblock_x86_fill(void)
|
|||
memblock_add(ei->addr, ei->size);
|
||||
}
|
||||
|
||||
memblock_analyze();
|
||||
memblock_dump_all();
|
||||
}
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ struct memblock {
|
|||
|
||||
extern struct memblock memblock;
|
||||
extern int memblock_debug;
|
||||
extern int memblock_can_resize;
|
||||
|
||||
#define memblock_dbg(fmt, ...) \
|
||||
if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
|
||||
|
@ -52,7 +51,7 @@ phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end,
|
|||
int memblock_free_reserved_regions(void);
|
||||
int memblock_reserve_reserved_regions(void);
|
||||
|
||||
void memblock_analyze(void);
|
||||
void memblock_allow_resize(void);
|
||||
int memblock_add(phys_addr_t base, phys_addr_t size);
|
||||
int memblock_remove(phys_addr_t base, phys_addr_t size);
|
||||
int memblock_free(phys_addr_t base, phys_addr_t size);
|
||||
|
|
|
@ -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