[Xen-changelog] [xen-unstable] ia64: fix build

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1276604809 -3600
# Node ID 840b3f5848645fd80faf7f45409e7c48bae1b911
# Parent  ca70fb5b4d40dc62ddfdb6137a01be6e18bc4e5c
ia64: fix build

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/include/asm-ia64/linux-xen/linux/cpu.h     |   26 ---------------
 xen/arch/ia64/xen/machine_kexec.c              |   43 -------------------------
 xen/include/asm-ia64/linux-xen/asm/processor.h |    1 
 xen/include/asm-ia64/linux-xen/asm/smp.h       |    2 +
 4 files changed, 3 insertions(+), 69 deletions(-)

diff -r ca70fb5b4d40 -r 840b3f584864 xen/arch/ia64/xen/machine_kexec.c
--- a/xen/arch/ia64/xen/machine_kexec.c Tue Jun 15 13:24:11 2010 +0100
+++ b/xen/arch/ia64/xen/machine_kexec.c Tue Jun 15 13:26:49 2010 +0100
@@ -72,49 +72,6 @@ static void ia64_machine_kexec(struct un
                            __pa(ia64_boot_param), image->reboot_code_buffer);
        BUG();
 }
-
-#if CONFIG_SMP
-/* Need to implement some subset of hotplug-cpu - enough to
- * send a cpu into rendevouz */
-
-/* N.B: The tasks frozen parameter can probably be dropped
- *      This can probably be rolled into cpu_down
- */
-static int _cpu_down(unsigned int cpu, int tasks_frozen)
-{
-       if (num_online_cpus() == 1)
-               return -EBUSY;
-
-       if (!cpu_online(cpu))
-               return -EINVAL;
-
-#ifndef XEN
-       /* XXX: What, if anything, should Xen do here? */
-       /* Ensure that we are not runnable on dying cpu */
-       old_affinity = current->cpus_allowed;
-       tmp = CPU_MASK_ALL;
-       cpu_clear(cpu, tmp);
-       set_cpus_allowed(current, tmp);
-#endif
-
-       cpu_clear(cpu, cpu_online_map);
-
-       __cpu_die(cpu);
-
-       return 0;
-}
-
-static int cpu_down(unsigned int cpu)
-{
-       int err;
-
-       /* Unlike Linux there is no lock, as there are no other callers
-        * and no other CPUS. */
-       err = _cpu_down(cpu, 0);
-
-       return 0;
-}
-#endif /* SMP */
 
 /* This should probably be an arch-hook called from kexec_exec()
  * Its also likely that it should be in the xen equivalent of
diff -r ca70fb5b4d40 -r 840b3f584864 
xen/include/asm-ia64/linux-xen/asm/processor.h
--- a/xen/include/asm-ia64/linux-xen/asm/processor.h    Tue Jun 15 13:24:11 
2010 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/processor.h    Tue Jun 15 13:26:49 
2010 +0100
@@ -188,6 +188,7 @@ struct cpuinfo_ia64 {
 };
 
 DECLARE_PER_CPU(struct cpuinfo_ia64, cpu_info);
+DECLARE_PER_CPU(int, cpu_state);
 
 /*
  * The "local" data variable.  It refers to the per-CPU data of the currently 
executing
diff -r ca70fb5b4d40 -r 840b3f584864 xen/include/asm-ia64/linux-xen/asm/smp.h
--- a/xen/include/asm-ia64/linux-xen/asm/smp.h  Tue Jun 15 13:24:11 2010 +0100
+++ b/xen/include/asm-ia64/linux-xen/asm/smp.h  Tue Jun 15 13:26:49 2010 +0100
@@ -60,6 +60,8 @@ extern char no_int_routing __devinitdata
 extern char no_int_routing __devinitdata;
 
 extern cpumask_t cpu_online_map;
+#define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
+
 DECLARE_PER_CPU(cpumask_t, cpu_core_map);
 DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
 extern int smp_num_siblings;
diff -r ca70fb5b4d40 -r 840b3f584864 xen/include/asm-ia64/linux-xen/linux/cpu.h
--- a/xen/include/asm-ia64/linux-xen/linux/cpu.h        Tue Jun 15 13:24:11 
2010 +0100
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#ifndef _ASM_IA64_CPU_H_
-#define _ASM_IA64_CPU_H_
-
-#include <linux/device.h>
-#include <linux/cpu.h>
-#include <linux/topology.h>
-#include <linux/percpu.h>
-
-#ifndef XEN
-struct ia64_cpu {
-       struct cpu cpu;
-};
-
-DECLARE_PER_CPU(struct ia64_cpu, cpu_devices);
-#endif
-
-DECLARE_PER_CPU(int, cpu_state);
-
-#ifndef XEN
-extern int arch_register_cpu(int num);
-#ifdef CONFIG_HOTPLUG_CPU
-extern void arch_unregister_cpu(int);
-#endif
-#endif
-
-#endif /* _ASM_IA64_CPU_H_ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog