1.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/irq_ia64.c	Thu May 03 14:27:26 2007 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/irq_ia64.c	Thu May 03 14:38:26 2007 -0600
     1.3 @@ -319,9 +319,9 @@ static struct irqaction resched_irqactio
     1.4   * required.
     1.5   */
     1.6  static void
     1.7 -xen_register_percpu_irq (unsigned int vec, struct irqaction *action, int save)
     1.8 +xen_register_percpu_irq(unsigned int cpu, unsigned int vec,
     1.9 +			 struct irqaction *action, int save)
    1.10  {
    1.11 -	unsigned int cpu = smp_processor_id();
    1.12  	irq_desc_t *desc;
    1.13  	int irq = 0;
    1.14  
    1.15 @@ -423,7 +423,8 @@ xen_bind_early_percpu_irq (void)
    1.16  	 * BSP will face with such step shortly
    1.17  	 */
    1.18  	for (i = 0; i < late_irq_cnt; i++)
    1.19 -		xen_register_percpu_irq(saved_percpu_irqs[i].irq,
    1.20 +		xen_register_percpu_irq(smp_processor_id(),
    1.21 +					saved_percpu_irqs[i].irq,
    1.22  		                        saved_percpu_irqs[i].action, 0);
    1.23  }
    1.24  
    1.25 @@ -479,11 +480,21 @@ static struct notifier_block unbind_evtc
    1.26  #endif
    1.27  
    1.28  DECLARE_PER_CPU(int, ipi_to_irq[NR_IPIS]);
    1.29 +void xen_smp_intr_init_early(unsigned int cpu)
    1.30 +{
    1.31 +#ifdef CONFIG_SMP
    1.32 +	unsigned int i;
    1.33 +
    1.34 +	for (i = 0; i < saved_irq_cnt; i++)
    1.35 +		xen_register_percpu_irq(cpu, saved_percpu_irqs[i].irq,
    1.36 +		                        saved_percpu_irqs[i].action, 0);
    1.37 +#endif
    1.38 +}
    1.39 +
    1.40  void xen_smp_intr_init(void)
    1.41  {
    1.42  #ifdef CONFIG_SMP
    1.43  	unsigned int cpu = smp_processor_id();
    1.44 -	unsigned int i = 0;
    1.45  	struct callback_register event = {
    1.46  		.type = CALLBACKTYPE_event,
    1.47  		.address = (unsigned long)&xen_event_callback,
    1.48 @@ -500,12 +511,9 @@ void xen_smp_intr_init(void)
    1.49  
    1.50  	/* This should be piggyback when setup vcpu guest context */
    1.51  	BUG_ON(HYPERVISOR_callback_op(CALLBACKOP_register, &event));
    1.52 -
    1.53 -	for (i = 0; i < saved_irq_cnt; i++)
    1.54 -		xen_register_percpu_irq(saved_percpu_irqs[i].irq,
    1.55 -		                        saved_percpu_irqs[i].action, 0);
    1.56  #endif /* CONFIG_SMP */
    1.57  }
    1.58 +
    1.59  #endif /* CONFIG_XEN */
    1.60  
    1.61  void
    1.62 @@ -516,7 +524,8 @@ register_percpu_irq (ia64_vector vec, st
    1.63  
    1.64  #ifdef CONFIG_XEN
    1.65  	if (is_running_on_xen())
    1.66 -		return xen_register_percpu_irq(vec, action, 1);
    1.67 +		return xen_register_percpu_irq(smp_processor_id(), 
    1.68 +					       vec, action, 1);
    1.69  #endif
    1.70  
    1.71  	for (irq = 0; irq < NR_IRQS; ++irq)
    1.72 @@ -572,6 +581,14 @@ ia64_send_ipi (int cpu, int vector, int 
    1.73  		/* TODO: we need to call vcpu_up here */
    1.74  		if (unlikely(vector == ap_wakeup_vector)) {
    1.75  			extern void xen_send_ipi (int cpu, int vec);
    1.76 +
    1.77 +			/* XXX
    1.78 +			 * This should be in __cpu_up(cpu) in ia64 smpboot.c
    1.79 +			 * like x86. But don't want to modify it,
    1.80 +			 * keep it untouched.
    1.81 +			 */
    1.82 +			xen_smp_intr_init_early(cpu);
    1.83 +
    1.84  			xen_send_ipi (cpu, vector);
    1.85  			//vcpu_prepare_and_up(cpu);
    1.86  			return;