[Xen-changelog] [xen-4.0-testing] IRQ: fix ia64 build for 21530:0383662ea34c

[Xen patchbot-4.0-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
# Date 1332510842 0
# Node ID 85312f3875b6a286759c441f394b0e28ad16723f
# Parent  c41ab909f08eef8ecf9cfa975e991a767695aed8
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@xxxxxxxxxxxxxx>
Committed-by: Keir Fraser <keir@xxxxxxx>
---


diff -r c41ab909f08e -r 85312f3875b6 xen/include/xen/irq.h
--- a/xen/include/xen/irq.h     Thu Mar 08 11:00:17 2012 +0000
+++ b/xen/include/xen/irq.h     Fri Mar 23 13:54:02 2012 +0000
@@ -43,7 +43,11 @@
     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);
 };
 

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