xen: secondary CPU handling adjustments

Add proper attributes and remove a few unused items.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/i386/kernel/time-xen.c b/arch/i386/kernel/time-xen.c
index c2a42860938af89a82a1b06eb9a2e97c95b437cc..4c72999f34a18b16ddab38dd2e15ad088ea9950b 100644 (file)
--- a/arch/i386/kernel/time-xen.c
+++ b/arch/i386/kernel/time-xen.c
@@ -1054,7 +1054,7 @@ void time_resume(void)
 #ifdef CONFIG_SMP
 static char timer_name[NR_CPUS][15];
 
-int local_setup_timer(unsigned int cpu)
+int __cpuinit local_setup_timer(unsigned int cpu)
 {
        int seq, irq;
 
@@ -1085,7 +1085,7 @@ int local_setup_timer(unsigned int cpu)
        return 0;
 }
 
-void local_teardown_timer(unsigned int cpu)
+void __cpuexit local_teardown_timer(unsigned int cpu)
 {
        BUG_ON(cpu == 0);
        unbind_from_irqhandler(per_cpu(timer_irq, cpu), NULL);

diff --git a/drivers/xen/core/smpboot.c b/drivers/xen/core/smpboot.c
index 6931c97c78902508bc4e47d6ff8c45e19c7648e2..8d2d633b288708795dd42f16930bab702866fc5d 100644 (file)
--- a/drivers/xen/core/smpboot.c
+++ b/drivers/xen/core/smpboot.c
@@ -59,8 +59,6 @@ static char callfunc_name[NR_CPUS][15];
 
 u8 cpu_2_logical_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
 
-void *xquad_portio;
-
 cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned;
 cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;
 EXPORT_SYMBOL(cpu_core_map);
@@ -115,7 +113,7 @@ remove_siblinginfo(int cpu)
        cpu_data[cpu].booted_cores = 0;
 }
 
-static int xen_smp_intr_init(unsigned int cpu)
+static int __cpuinit xen_smp_intr_init(unsigned int cpu)
 {
        int rc;
 
@@ -392,21 +390,9 @@ void __cpu_die(unsigned int cpu)
                alternatives_smp_switch(0);
 }
 
-#else /* !CONFIG_HOTPLUG_CPU */
-
-int __cpu_disable(void)
-{
-       return -ENOSYS;
-}
-
-void __cpu_die(unsigned int cpu)
-{
-       BUG();
-}
-
 #endif /* CONFIG_HOTPLUG_CPU */
 
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
 {
        int rc;