* [PATCH] acpi, memory-hotplug: parse SRAT before memblock is ready fix
@ 2013-01-27 15:38 Michal Hocko
0 siblings, 0 replies; only message in thread
From: Michal Hocko @ 2013-01-27 15:38 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-kernel, linux-mm, 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 ‘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.
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Wu Jianguo <wujianguo@huawei.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Len Brown <lenb@kernel.org>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Michal Hocko <mhocko@suse.cz>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-27 15:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-27 15:38 [PATCH] acpi, memory-hotplug: parse SRAT before memblock is ready fix Michal Hocko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).