From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx116.postini.com [74.125.245.116]) by kanga.kvack.org (Postfix) with SMTP id 8CA4E6B0005 for ; Sun, 27 Jan 2013 10:39:47 -0500 (EST) From: Michal Hocko Subject: [PATCH] acpi, memory-hotplug: parse SRAT before memblock is ready fix Date: Sun, 27 Jan 2013 16:38:54 +0100 Message-Id: <1359301134-421-1-git-send-email-mhocko@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Tang Chen , Wen Congyang , KOSAKI Motohiro , Jiang Liu , Jianguo Wu , Kamezawa Hiroyuki , Lai Jiangshan , Yasuaki Ishimatsu , Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Len Brown , "Brown, Len" alnoconfig complains: arch/x86/kernel/setup.c: In function a??setup_archa??: arch/x86/kernel/setup.c:917: error: implicit declaration of function a??early_parse_srata?? because early_parse_srat is not declared for !CONFIG_ACPI. Moreover it is defined only for CONFIG_ACPI_NUMA. I am not sure what is the correct way to fix this but I guess that providing an empty definition for !CONFIG_ACPI_NUMA is OK. Cc: Tang Chen Cc: Wen Congyang Cc: KOSAKI Motohiro Cc: Jiang Liu Cc: Jianguo Wu Cc: Kamezawa Hiroyuki Cc: Lai Jiangshan Cc: Wu Jianguo Cc: Yasuaki Ishimatsu Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Len Brown Cc: "Brown, Len" Signed-off-by: Michal Hocko --- include/linux/acpi.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index b29e0aa..4c66ac0 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -83,7 +83,6 @@ int acpi_boot_init (void); void acpi_boot_table_init (void); int acpi_mps_check (void); int acpi_numa_init (void); -void __init early_parse_srat(void); int acpi_table_init (void); int acpi_table_parse (char *id, acpi_table_handler handler); @@ -421,6 +420,14 @@ static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), #endif /* !CONFIG_ACPI */ +#ifdef CONFIG_ACPI_NUMA +void __init early_parse_srat(void); +#else +static inline void early_parse_srat(void) +{ +} +#endif + #ifdef CONFIG_ACPI void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, u32 pm1a_ctrl, u32 pm1b_ctrl)); -- 1.7.10.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org