backports: irq_get_trigger_type requires CONFIG_HAVE_GENERIC_HARDIRQS=y
authorStefan Assmann <sassmann@kpanic.de>
Fri, 8 Aug 2014 12:00:26 +0000 (14:00 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 9 Aug 2014 12:02:41 +0000 (14:02 +0200)
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 <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
backport/backport-include/linux/irq.h

index 1738e9b8967b6147bc3a4fde4b45b9b1b4554749..29b543bd081df3fdbd03f9eb19f3cde08e07e86f 100644 (file)
@@ -2,6 +2,7 @@
 #define __BACKPORT_LINUX_IRQ_H
 #include_next <linux/irq.h>
 
+#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 */