From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932253Ab3FMN2i (ORCPT ); Thu, 13 Jun 2013 09:28:38 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:6846 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1758404Ab3FMN2W (ORCPT ); Thu, 13 Jun 2013 09:28:22 -0400 X-IronPort-AV: E=Sophos;i="4.87,858,1363104000"; d="scan'208";a="7537721" From: Tang Chen To: tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pekka Enberg , Jacob Shin Subject: [Part1 PATCH v5 18/22] x86, mm, numa: Add early_initmem_init() stub Date: Thu, 13 Jun 2013 21:03:05 +0800 Message-Id: <1371128589-8953-19-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1371128589-8953-1-git-send-email-tangchen@cn.fujitsu.com> References: <1371128589-8953-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/13 20:58:18, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/13 20:58:28, Serialize complete at 2013/06/13 20:58:28 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yinghai Lu Introduce early_initmem_init() to call early_x86_numa_init(), which will be used to parse numa info earlier. Later will call init_mem_mapping for all the nodes. Signed-off-by: Yinghai Lu Cc: Pekka Enberg Cc: Jacob Shin Reviewed-by: Tang Chen Tested-by: Tang Chen --- arch/x86/include/asm/page_types.h | 1 + arch/x86/kernel/setup.c | 1 + arch/x86/mm/init.c | 6 ++++++ arch/x86/mm/numa.c | 7 +++++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h index b012b82..d04dd8c 100644 --- a/arch/x86/include/asm/page_types.h +++ b/arch/x86/include/asm/page_types.h @@ -55,6 +55,7 @@ bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn); extern unsigned long init_memory_mapping(unsigned long start, unsigned long end); +void early_initmem_init(void); extern void initmem_init(void); #endif /* !__ASSEMBLY__ */ diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d11b1b7..301165e 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1162,6 +1162,7 @@ void __init setup_arch(char **cmdline_p) early_acpi_boot_init(); + early_initmem_init(); initmem_init(); memblock_find_dma_reserve(); diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 8554656..3c21f16 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -467,6 +467,12 @@ void __init init_mem_mapping(void) early_memtest(0, max_pfn_mapped << PAGE_SHIFT); } +#ifndef CONFIG_NUMA +void __init early_initmem_init(void) +{ +} +#endif + /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address * is valid. The argument is a physical page number. diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 630e09f..7d76936 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -665,13 +665,16 @@ static void __init early_x86_numa_init(void) numa_init(dummy_numa_init); } +void __init early_initmem_init(void) +{ + early_x86_numa_init(); +} + void __init x86_numa_init(void) { int i, nid; struct numa_meminfo *mi = &numa_meminfo; - early_x86_numa_init(); - #ifdef CONFIG_ACPI_NUMA if (srat_used) x86_acpi_numa_init_slit(); -- 1.7.1