Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / xen / smp.c

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index be5cbb2b7c60e32aa536c1eb8e7a44b1a6c6b94d..d77da613b1d2e49e626e601a6cdb9027d807fb18 100644 (file)
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -332,7 +332,8 @@ static void xen_smp_cpus_done(unsigned int max_cpus)
 {
 }
 
-int xen_cpu_disable(void)
+#ifdef CONFIG_HOTPLUG_CPU
+static int xen_cpu_disable(void)
 {
        unsigned int cpu = smp_processor_id();
        if (cpu == 0)
@@ -344,7 +345,7 @@ int xen_cpu_disable(void)
        return 0;
 }
 
-void xen_cpu_die(unsigned int cpu)
+static void xen_cpu_die(unsigned int cpu)
 {
        while (HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) {
                current->state = TASK_UNINTERRUPTIBLE;
@@ -361,13 +362,30 @@ void xen_cpu_die(unsigned int cpu)
                alternatives_smp_switch(0);
 }
 
-void xen_play_dead(void)
+static void xen_play_dead(void)
 {
        play_dead_common();
        HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
        cpu_bringup();
 }
 
+#else /* !CONFIG_HOTPLUG_CPU */
+static int xen_cpu_disable(void)
+{
+       return -ENOSYS;
+}
+
+static void xen_cpu_die(unsigned int cpu)
+{
+       BUG();
+}
+
+static void xen_play_dead(void)
+{
+       BUG();
+}
+
+#endif
 static void stop_self(void *v)
 {
        int cpu = smp_processor_id();