提交 f63b6a05 编写于 作者: T Thomas Gleixner

genirq: Replace reserve_irqs in core code

We want to get rid of the public interface.
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Reviewed-by: NGrant Likely <grant.likely@linaro.org>
Tested-by: NTony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140507154340.061990194@linutronix.deSigned-off-by: NThomas Gleixner <tglx@linutronix.de>
上级 be403401
...@@ -40,10 +40,9 @@ int irq_set_chip(unsigned int irq, struct irq_chip *chip) ...@@ -40,10 +40,9 @@ int irq_set_chip(unsigned int irq, struct irq_chip *chip)
irq_put_desc_unlock(desc, flags); irq_put_desc_unlock(desc, flags);
/* /*
* For !CONFIG_SPARSE_IRQ make the irq show up in * For !CONFIG_SPARSE_IRQ make the irq show up in
* allocated_irqs. For the CONFIG_SPARSE_IRQ case, it is * allocated_irqs.
* already marked, and this call is harmless.
*/ */
irq_reserve_irq(irq); irq_mark_irq(irq);
return 0; return 0;
} }
EXPORT_SYMBOL(irq_set_chip); EXPORT_SYMBOL(irq_set_chip);
......
...@@ -76,6 +76,12 @@ extern void mask_irq(struct irq_desc *desc); ...@@ -76,6 +76,12 @@ extern void mask_irq(struct irq_desc *desc);
extern void unmask_irq(struct irq_desc *desc); extern void unmask_irq(struct irq_desc *desc);
extern void unmask_threaded_irq(struct irq_desc *desc); extern void unmask_threaded_irq(struct irq_desc *desc);
#ifdef CONFIG_SPARSE_IRQ
static inline void irq_mark_irq(unsigned int irq) { }
#else
extern void irq_mark_irq(unsigned int irq);
#endif
extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr); extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr);
irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action); irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action);
......
...@@ -299,6 +299,13 @@ static int irq_expand_nr_irqs(unsigned int nr) ...@@ -299,6 +299,13 @@ static int irq_expand_nr_irqs(unsigned int nr)
return -ENOMEM; return -ENOMEM;
} }
void irq_mark_irq(unsigned int irq)
{
mutex_lock(&sparse_irq_lock);
bitmap_set(allocated_irqs, irq, 1);
mutex_unlock(&sparse_irq_lock);
}
#endif /* !CONFIG_SPARSE_IRQ */ #endif /* !CONFIG_SPARSE_IRQ */
/** /**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册