IRQ: fix ia64 build for 21530:0383662ea34c

On ia64, 21530:0383662ea34c introduces the following error:
  irq.c:129: warning: initialization from incompatible pointer type
  irq.c: In function '__do_IRQ':
  irq.c:159: error: too few arguments to function 'desc->handler->end'
  irq.c:223: error: too few arguments to function 'desc->handler->end'
  irq.c: In function 'pirq_guest_eoi':
  irq.c:450: error: too few arguments to function 'desc->handler->end'
  irq.c: In function 'pirq_guest_unbind':
  irq.c:579: error: too few arguments to function 'desc->handler->end'

This patch is a part of xen-unstable 24145:967845cb565b.

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
Committed-by: Keir Fraser <keir@xen.org>

diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h
index 34c4aefd109e007955ad44d48b8b4479b4711557..5365d3e2e37183e5f7d9cd2d398b8f25311ad3a2 100644 (file)
--- a/xen/include/xen/irq.h
+++ b/xen/include/xen/irq.h
@@ -43,7 +43,11 @@ struct hw_interrupt_type {
     void (*enable)(unsigned int irq);
     void (*disable)(unsigned int irq);
     void (*ack)(unsigned int irq);
+#ifdef CONFIG_X86
     void (*end)(unsigned int irq, u8 vector);
+#else
+    void (*end)(struct irq_desc *);
+#endif
     void (*set_affinity)(unsigned int irq, cpumask_t mask);
 };