From 4d2cd5b03c5e7c535dd41471d7e34fccbeb80081 Mon Sep 17 00:00:00 2001 From: Michal Hocko Date: Wed, 20 Feb 2013 13:14:28 +1100 Subject: [PATCH] acpi, memory-hotplug: parse SRAT before memblock is ready fix alnoconfig complains: arch/x86/kernel/setup.c: In function `setup_arch': arch/x86/kernel/setup.c:917: error: implicit declaration of function `early_parse_srat' 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. Signed-off-by: Michal Hocko Cc: Tang Chen Cc: Wen Congyang Cc: Jiang Liu Cc: Jianguo Wu Cc: Lai Jiangshan Cc: Yasuaki Ishimatsu Signed-off-by: Andrew Morton --- 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 b7cc2309671f..f46cfd73a553 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -94,7 +94,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_tbl_table_handler handler); @@ -486,6 +485,14 @@ static inline bool acpi_driver_match_device(struct device *dev, #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)); -- 2.39.5