Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752278Ab3CYEKp (ORCPT ); Mon, 25 Mar 2013 00:10:45 -0400 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:44180 "EHLO LGEMRELSE7Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750752Ab3CYEKh (ORCPT ); Mon, 25 Mar 2013 00:10:37 -0400 X-AuditID: 9c930197-b7c9dae000006959-72-514fce3a7f68 From: Joonsoo Kim To: Russell King Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Pitre , Will Deacon , Joonsoo Kim Subject: [RFC PATCH 4/6] ARM, mm: don't do arm_bootmem_init() if CONFIG_NO_BOOTMEM Date: Mon, 25 Mar 2013 13:11:12 +0900 Message-Id: <1364184674-13798-5-git-send-email-iamjoonsoo.kim@lge.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364184674-13798-1-git-send-email-iamjoonsoo.kim@lge.com> References: <1364184674-13798-1-git-send-email-iamjoonsoo.kim@lge.com> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1591 Lines: 55 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 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/