diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2014-08-08 14:00:26 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-08-10 20:39:59 +0200 |
| commit | 8bf29482ead8dac9346c275467581340e7b5208e (patch) | |
| tree | df6e79007363380e9df381a1007368471a40c291 | |
| parent | f0d955f3b72dd29f222e70263009f6e519de0482 (diff) | |
backports: irq_get_trigger_type requires CONFIG_HAVE_GENERIC_HARDIRQS=y
Upstream commit 2cc1500fe79718fad2362b75b01d36e4e6bbd0c8
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>
| -rw-r--r-- | backport/backport-include/linux/irq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backport/backport-include/linux/irq.h b/backport/backport-include/linux/irq.h index 1738e9b8..29b543bd 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 <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 */ |