Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752594Ab3JERbp (ORCPT ); Sat, 5 Oct 2013 13:31:45 -0400 Received: from mail-pd0-f182.google.com ([209.85.192.182]:46492 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751525Ab3JERbo (ORCPT ); Sat, 5 Oct 2013 13:31:44 -0400 Message-ID: <52504CF8.6000708@gmail.com> Date: Sun, 06 Oct 2013 01:31:36 +0800 From: Zhang Yanfei User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.5) Gecko/20120607 Thunderbird/10.0.5 MIME-Version: 1.0 To: Andrew Morton CC: Linux MM , "linux-kernel@vger.kernel.org" Subject: [PATCH 1/2] mm/page_alloc.c: Implement an empty get_pfn_range_for_nid Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1484 Lines: 43 From: Zhang Yanfei Implement an empty get_pfn_range_for_nid for !CONFIG_HAVE_MEMBLOCK_NODE_MAP, so that we could remove the #ifdef in free_area_init_node. Signed-off-by: Zhang Yanfei --- mm/page_alloc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index dd886fa..1fb13b6 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4566,6 +4566,11 @@ static unsigned long __meminit zone_absent_pages_in_node(int nid, } #else /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ +void __meminit get_pfn_range_for_nid(unsigned int nid, + unsigned long *ignored, unsigned long *ignored) +{ +} + static inline unsigned long __meminit zone_spanned_pages_in_node(int nid, unsigned long zone_type, unsigned long node_start_pfn, @@ -4871,9 +4876,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, pgdat->node_id = nid; pgdat->node_start_pfn = node_start_pfn; init_zone_allows_reclaim(nid); -#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP get_pfn_range_for_nid(nid, &start_pfn, &end_pfn); -#endif calculate_node_totalpages(pgdat, start_pfn, end_pfn, zones_size, zholes_size); -- 1.7.1 -- 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/