[Xen-devel] [PATCH] ia64: fix build

["Jan Beulich" <JBeulich@xxxxxxxxxx>]

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- 2010-06-15.orig/xen/arch/ia64/xen/machine_kexec.c   2009-02-02 
09:02:52.000000000 +0100
+++ 2010-06-15/xen/arch/ia64/xen/machine_kexec.c        2010-06-15 
10:21:55.000000000 +0200
@@ -73,49 +73,6 @@ static void ia64_machine_kexec(struct un
        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
  * arch/ia64/kernel/process.c */
--- 2010-06-15.orig/xen/include/asm-ia64/linux-xen/asm/processor.h      
2009-03-16 16:09:07.000000000 +0100
+++ 2010-06-15/xen/include/asm-ia64/linux-xen/asm/processor.h   2010-06-15 
10:35:08.000000000 +0200
@@ -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
--- 2010-06-15.orig/xen/include/asm-ia64/linux-xen/asm/smp.h    2010-05-20 
09:59:27.000000000 +0200
+++ 2010-06-15/xen/include/asm-ia64/linux-xen/asm/smp.h 2010-06-15 
10:37:37.000000000 +0200
@@ -60,6 +60,8 @@ extern struct smp_boot_data {
 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;
--- 2010-06-15.orig/xen/include/asm-ia64/linux-xen/linux/cpu.h  2007-10-09 
11:46:23.000000000 +0200
+++ /dev/null   1970-01-01 00:00:00.000000000 +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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel