Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754002Ab3FOA6U (ORCPT ); Fri, 14 Jun 2013 20:58:20 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:17670 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753603Ab3FOA5H (ORCPT ); Fri, 14 Jun 2013 20:57:07 -0400 From: Yinghai Lu To: "H. Peter Anvin" Cc: Thomas Gleixner , Ingo Molnar , Andrew Morton , Tejun Heo , Thomas Renninger , Tang Chen , linux-kernel@vger.kernel.org, Yinghai Lu , Pekka Enberg , Jacob Shin Subject: [PATCH v5 18/22] x86, mm, numa: Add early_initmem_init() stub Date: Fri, 14 Jun 2013 17:56:36 -0700 Message-Id: <1371257800-11720-19-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1371257800-11720-1-git-send-email-yinghai@kernel.org> References: <1371257800-11720-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsinet21.oracle.com [141.146.126.237] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2580 Lines: 88 early_initmem_init() call early_x86_numa_init() to parse numa info early. Later will call init_mem_mapping for nodes in it. 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.8.1.4 -- 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/