diff options
| author | KUWAMURA Shin'ya <kuwa@jp.fujitsu.com> | 2012-03-23 13:54:02 +0000 |
|---|---|---|
| committer | KUWAMURA Shin'ya <kuwa@jp.fujitsu.com> | 2012-03-23 13:54:02 +0000 |
| commit | aba7b54dc8ee2d0161c1adc8b7d51d55a3804a01 (patch) | |
| tree | 629f4067a0a4ff640d8e64f4c42bf4ccf2fb1fb4 | |
| parent | 860192ce0d4fa1eaa7fc2766b1ba9c2211b4be2d (diff) | |
| download | xen-aba7b54dc8ee2d0161c1adc8b7d51d55a3804a01.tar.gz xen-aba7b54dc8ee2d0161c1adc8b7d51d55a3804a01.tar.bz2 xen-aba7b54dc8ee2d0161c1adc8b7d51d55a3804a01.zip | |
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>
| -rw-r--r-- | xen/include/xen/irq.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 34c4aefd10..5365d3e2e3 100644 --- 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); }; |