From patchwork Sat Apr 13 15:36:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 236362 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C25602C00B6 for ; Sun, 14 Apr 2013 01:44:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754794Ab3DMPoe (ORCPT ); Sat, 13 Apr 2013 11:44:34 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:43519 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754765Ab3DMPob (ORCPT ); Sat, 13 Apr 2013 11:44:31 -0400 Received: by mail-pd0-f169.google.com with SMTP id 10so1871794pdc.0 for ; Sat, 13 Apr 2013 08:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=3HLzniQHc9Vn/pKSt9aRG9ezL/RzSLsJ7JQWQgmNYUU=; b=FKoeU4CDpsnJ4n1vttddLtNefRjEmLVRS/NdcycEbDcvCgdVDMOcFp1CdS/awg/RqR E4I646vW+WlPjGBVHOUFw8TI7o0IxurUchV15ZQbVpSne6LA9AobXanRBTRKCdFncDxo 2MYMfFOF2PccCQUV1q1PGdUW3jqJIhv15bo/86tf+b9GWJVTTVlCLMHUZu8pewVg5/Oc fEoEleD52wFbgnVt13Q+ydbk8pZY5gB5woUqT3ccycSbCaEbBnaZwEvy8pPeMDewA0/N Y6DqJZZFfW21HH9KCoQLXRkYUP1aRKv+HldGbtrNlR/XWS/31QeoUtBp3T/o7aC7IXsd 1aRw== X-Received: by 10.68.185.162 with SMTP id fd2mr20276538pbc.176.1365867870589; Sat, 13 Apr 2013 08:44:30 -0700 (PDT) Received: from localhost.localdomain ([114.250.101.164]) by mx.google.com with ESMTPS id dg5sm12981254pbc.29.2013.04.13.08.44.17 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Apr 2013 08:44:29 -0700 (PDT) From: Jiang Liu To: Andrew Morton , Yinghai Lu Cc: Jiang Liu , David Rientjes , Wen Congyang , Mel Gorman , Minchan Kim , KAMEZAWA Hiroyuki , Michal Hocko , David Howells , Mark Salter , Jianguo Wu , linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Yasuaki Ishimatsu , Johannes Weiner , Tejun Heo , sparclinux@vger.kernel.org Subject: [RFC PATCH v1 19/19] mm: call register_page_bootmem_info_node() from mm core Date: Sat, 13 Apr 2013 23:36:39 +0800 Message-Id: <1365867399-21323-20-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365867399-21323-1-git-send-email-jiang.liu@huawei.com> References: <1365867399-21323-1-git-send-email-jiang.liu@huawei.com> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Function register_page_bootmem_info_node() is suitably defined for both HOTPLUG and non-HOTPLUG configurations, so we could call it from mm core instead of arch specific code. This could simplify arch implementations. Signed-off-by: Jiang Liu Cc: "David S. Miller" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: Yasuaki Ishimatsu Cc: Michal Hocko Cc: Yinghai Lu Cc: Wen Congyang Cc: Johannes Weiner Cc: Tejun Heo Cc: sparclinux@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org --- arch/sparc/mm/init_64.c | 12 ------------ arch/x86/mm/init_64.c | 12 ------------ mm/bootmem.c | 6 ++++++ mm/nobootmem.c | 6 ++++++ 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index b1e35b7..5530c09 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2027,16 +2027,6 @@ static void __init patch_tlb_miss_handler_bitmap(void) flushi(&valid_addr_bitmap_insn[0]); } -static void __init register_page_bootmem_info(void) -{ -#ifdef CONFIG_NEED_MULTIPLE_NODES - int i; - - for_each_online_node(i) - if (NODE_DATA(i)->node_spanned_pages) - register_page_bootmem_info_node(NODE_DATA(i)); -#endif -} void __init mem_init(void) { unsigned long addr, last; @@ -2052,8 +2042,6 @@ void __init mem_init(void) patch_tlb_miss_handler_bitmap(); high_memory = __va(last_valid_pfn << PAGE_SHIFT); - - register_page_bootmem_info(); free_all_bootmem(); /* diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 650264b..72b5141 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1031,24 +1031,12 @@ int __ref arch_remove_memory(u64 start, u64 size) static struct kcore_list kcore_vsyscall; -static void __init register_page_bootmem_info(void) -{ -#ifdef CONFIG_NUMA - int i; - - for_each_online_node(i) - register_page_bootmem_info_node(NODE_DATA(i)); -#endif -} - void __init mem_init(void) { pci_iommu_alloc(); /* clear_bss() already clear the empty_zero_page */ - register_page_bootmem_info(); - /* this will put all memory onto the freelists */ free_all_bootmem(); after_bootmem = 1; diff --git a/mm/bootmem.c b/mm/bootmem.c index fab8f63..3cf36ac 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -273,6 +273,12 @@ unsigned long __init free_all_bootmem(void) { unsigned long total_pages = 0; bootmem_data_t *bdata; +#ifdef CONFIG_NEED_MULTIPLE_NODES + pg_data_t *pgdat; + + for_each_online_pgdat(pgdat) + register_page_bootmem_info_node(pgdat); +#endif reset_all_zones_managed_pages(); diff --git a/mm/nobootmem.c b/mm/nobootmem.c index 6b63cd6..ccc6630 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -166,6 +166,12 @@ void __init reset_all_zones_managed_pages(void) unsigned long __init free_all_bootmem(void) { unsigned long pages; +#ifdef CONFIG_NEED_MULTIPLE_NODES + pg_data_t *pgdat; + + for_each_online_pgdat(pgdat) + register_page_bootmem_info_node(pgdat); +#endif reset_all_zones_managed_pages();