Commit e3d6e0e7 authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents 5a433f7a 10abc7df
...@@ -161,6 +161,11 @@ enum { ...@@ -161,6 +161,11 @@ enum {
IRQ_DOMAIN_FLAG_NONCORE = (1 << 16), 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 #ifdef CONFIG_IRQ_DOMAIN
struct irq_domain *__irq_domain_add(struct device_node *of_node, int size, struct irq_domain *__irq_domain_add(struct device_node *of_node, int size,
irq_hw_number_t hwirq_max, int direct_max, irq_hw_number_t hwirq_max, int direct_max,
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
/** /**
* handle_bad_irq - handle spurious and unhandled irqs * handle_bad_irq - handle spurious and unhandled irqs
* @irq: the interrupt number
* @desc: description of the interrupt * @desc: description of the interrupt
* *
* Handles spurious and unhandled IRQ's. It also prints a debugmessage. * Handles spurious and unhandled IRQ's. It also prints a debugmessage.
...@@ -35,6 +34,7 @@ void handle_bad_irq(struct irq_desc *desc) ...@@ -35,6 +34,7 @@ void handle_bad_irq(struct irq_desc *desc)
kstat_incr_irqs_this_cpu(desc); kstat_incr_irqs_this_cpu(desc);
ack_bad_irq(irq); ack_bad_irq(irq);
} }
EXPORT_SYMBOL_GPL(handle_bad_irq);
/* /*
* Special, empty irq handler: * Special, empty irq handler:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment