From: Alex Nixon <alex.nixon@citrix.com>
Date: Mon, 8 Sep 2008 12:43:33 +0000 (+0100)
Subject: x86, xen: fix build when !CONFIG_HOTPLUG_CPU
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2737146b3aa2cf8b5d5ae87a18c49fe1c374528b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

x86, xen: fix build when !CONFIG_HOTPLUG_CPU

Signed-off-by: Alex Nixon <alex.nixon@citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index be5cbb2b7c60..bf51a466d62c 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -332,6 +332,7 @@ static void xen_smp_cpus_done(unsigned int max_cpus)
 {
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 int xen_cpu_disable(void)
 {
 	unsigned int cpu = smp_processor_id();
@@ -368,6 +369,23 @@ void xen_play_dead(void)
 	cpu_bringup();
 }
 
+#else /* !CONFIG_HOTPLUG_CPU */
+int xen_cpu_disable(void)
+{
+	return -ENOSYS;
+}
+
+void xen_cpu_die(unsigned int cpu)
+{
+	BUG();
+}
+
+void xen_play_dead(void)
+{
+	BUG();
+}
+
+#endif
 static void stop_self(void *v)
 {
 	int cpu = smp_processor_id();