arm_bootmem_init() initialize a bitmap for bootmem and it is not needed for CONFIG_NO_BOOTMEM. So skip it when CONFIG_NO_BOOTMEM.
Signed-off-by: Joonsoo Kim <iamjoonsoo....@lge.com> diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index ad722f1..049414a 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -149,6 +149,12 @@ static void __init find_limits(unsigned long *min, unsigned long *max_low, *max_high = bank_pfn_end(&mi->bank[mi->nr_banks - 1]); } +#ifdef CONFIG_NO_BOOTMEM +static inline void __init arm_bootmem_init(unsigned long start_pfn, + unsigned long end_pfn) +{ +} +#else static void __init arm_bootmem_init(unsigned long start_pfn, unsigned long end_pfn) { @@ -169,7 +175,6 @@ static void __init arm_bootmem_init(unsigned long start_pfn, * Initialise the bootmem allocator, handing the * memory banks over to bootmem. */ - node_set_online(0); pgdat = NODE_DATA(0); init_bootmem_node(pgdat, __phys_to_pfn(bitmap), start_pfn, end_pfn); @@ -200,6 +205,7 @@ static void __init arm_bootmem_init(unsigned long start_pfn, (end - start) << PAGE_SHIFT, BOOTMEM_DEFAULT); } } +#endif #ifdef CONFIG_ZONE_DMA @@ -392,6 +398,7 @@ void __init bootmem_init(void) find_limits(&min, &max_low, &max_high); + node_set_online(0); arm_bootmem_init(min, max_low); /* -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/