Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit e3d6e0e70139 · 2015-10-11T10:16:59.000-07:00
Pull irq fixes from Thomas Gleixner:
 "Three trivial commits:

   - Fix a kerneldoc regression

   - Export handle_bad_irq to unbreak a driver in next

   - Add an accessor for the of_node field so refactoring in next does
     not depend on merge ordering"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqdomain: Add an accessor for the of_node field
  genirq: Fix handle_bad_irq kerneldoc comment
  genirq: Export handle_bad_irq
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
@@ -161,6 +161,11 @@ enum {
 	IRQ_DOMAIN_FLAG_NONCORE		= (1 << 16),
 };
 
+static inline struct device_node *irq_domain_get_of_node(struct irq_domain *d)
+{
+	return d->of_node;
+}
+
 #ifdef CONFIG_IRQ_DOMAIN
 struct irq_domain *__irq_domain_add(struct device_node *of_node, int size,
 				    irq_hw_number_t hwirq_max, int direct_max,
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
@@ -22,7 +22,6 @@
 
 /**
  * handle_bad_irq - handle spurious and unhandled irqs
- * @irq:       the interrupt number
  * @desc:      description of the interrupt
  *
  * Handles spurious and unhandled IRQ's. It also prints a debugmessage.
@@ -35,6 +34,7 @@ void handle_bad_irq(struct irq_desc *desc)
 	kstat_incr_irqs_this_cpu(desc);
 	ack_bad_irq(irq);
 }
+EXPORT_SYMBOL_GPL(handle_bad_irq);
 
 /*
  * Special, empty irq handler:

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* handle_bad_irq - handle spurious and unhandled irqs`
`25`		`- * @irq: the interrupt number`
`26`	`25`	`* @desc: description of the interrupt`
`27`	`26`	`*`
`28`	`27`	`* Handles spurious and unhandled IRQ's. It also prints a debugmessage.`
`@@ -35,6 +34,7 @@ void handle_bad_irq(struct irq_desc *desc)`
`35`	`34`	`kstat_incr_irqs_this_cpu(desc);`
`36`	`35`	`ack_bad_irq(irq);`
`37`	`36`	`}`
	`37`	`+EXPORT_SYMBOL_GPL(handle_bad_irq);`
`38`	`38`
`39`	`39`	`/*`
`40`	`40`	`* Special, empty irq handler:`