[PATCH] IRQ: fix ia64 build for 21530:0383662ea34c

[PATCH] IRQ: fix ia64 build for 21530:0383662ea34c

[KUWAMURA Shin'ya]

[-- Attachment #1: Type: Text/Plain, Size: 703 bytes --]

Hi,

This patch is for xen-4.0-testing.

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>
-- 
  KUWAMURA Shin'ya

[-- Attachment #2: fix-4.0-ia64-irq-end.patch --]
[-- Type: Text/X-Patch, Size: 1401 bytes --]

# HG changeset patch
# User KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
# Date 1332486111 -32400
# Node ID 79efd987e0c95d7bf81b8c818a77a53c72850d35
# 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@jp.fujitsu.com>

diff -r c41ab909f08e -r 79efd987e0c9 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 16:01:51 2012 +0900
@@ -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);
 };
 

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel