From 2cc1500fe79718fad2362b75b01d36e4e6bbd0c8 Mon Sep 17 00:00:00 2001 From: Stefan Assmann Date: Fri, 8 Aug 2014 14:00:26 +0200 Subject: [PATCH] backports: irq_get_trigger_type requires CONFIG_HAVE_GENERIC_HARDIRQS=y Only backport irq_get_trigger_type on architectures that have CONFIG_HAVE_GENERIC_HARDIRQS=y. Otherwise we end up with: In file included from drivers/pci/msi.c:11:0: backport/backport-include/linux/irq.h: In function 'irq_get_trigger_type': backport/backport-include/linux/irq.h:9:9: error: implicit declaration of function 'irq_get_irq_data' [-Werror=implicit-function-declaration] struct irq_data *d = irq_get_irq_data(irq); Signed-off-by: Stefan Assmann Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/irq.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backport/backport-include/linux/irq.h b/backport/backport-include/linux/irq.h index 1738e9b8967b..29b543bd081d 100644 --- a/backport/backport-include/linux/irq.h +++ b/backport/backport-include/linux/irq.h @@ -2,6 +2,7 @@ #define __BACKPORT_LINUX_IRQ_H #include_next +#ifdef CONFIG_HAVE_GENERIC_HARDIRQS #if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0) #define irq_get_trigger_type LINUX_BACKPORT(irq_get_trigger_type) static inline u32 irq_get_trigger_type(unsigned int irq) @@ -10,5 +11,6 @@ static inline u32 irq_get_trigger_type(unsigned int irq) return d ? irqd_get_trigger_type(d) : 0; } #endif +#endif /* CONFIG_HAVE_GENERIC_HARDIRQS */ #endif /* __BACKPORT_LINUX_IRQ_H */ -- 2.30.2