Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

1 files changed, 18 insertions, 0 deletions

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 9127f6b51a39..0c9cb63e6895 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -61,6 +61,17 @@
 
 typedef irqreturn_t (*irq_handler_t)(int, void *);
 
+/**
+ * struct irqaction - per interrupt action descriptor
+ * @handler:    interrupt handler function
+ * @flags:      flags (see IRQF_* above)
+ * @mask:       no comment as it is useless and about to be removed
+ * @name:       name of the device
+ * @dev_id:     cookie to identify the device
+ * @next:       pointer to the next irqaction for shared interrupts
+ * @irq:        interrupt number
+ * @dir:        pointer to the proc/irq/NN/name entry
+ */
 struct irqaction {
         irq_handler_t handler;
         unsigned long flags;
@@ -462,11 +473,18 @@ static inline void init_irq_proc(void)
 }
 #endif
 
+#if defined(CONFIG_GENERIC_HARDIRQS) && defined(CONFIG_DEBUG_SHIRQ)
+extern void debug_poll_all_shared_irqs(void);
+#else
+static inline void debug_poll_all_shared_irqs(void) { }
+#endif
+
 int show_interrupts(struct seq_file *p, void *v);
 
 struct irq_desc;
 
 extern int early_irq_init(void);
+extern int arch_probe_nr_irqs(void);
 extern int arch_early_irq_init(void);
 extern int arch_init_chip_data(struct irq_desc *desc, int cpu);