Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f63b6a05 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Replace reserve_irqs in core code 



We want to get rid of the public interface.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Tested-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140507154340.061990194@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent be403401

kernel/irq/chip.c

+2 −3
Original line number Diff line number Diff line
@@ -40,10 +40,9 @@ int irq_set_chip(unsigned int irq, struct irq_chip *chip) 
	irq_put_desc_unlock(desc, flags);

	/*

	 * For !CONFIG_SPARSE_IRQ make the irq show up in

	 * allocated_irqs. For the CONFIG_SPARSE_IRQ case, it is

	 * already marked, and this call is harmless.

	 * allocated_irqs.

	 */

	irq_reserve_irq(irq);

	irq_mark_irq(irq);

	return 0;

}

EXPORT_SYMBOL(irq_set_chip);

kernel/irq/internals.h

+6 −0
Original line number Diff line number Diff line
@@ -76,6 +76,12 @@ extern void mask_irq(struct irq_desc *desc); 
extern void unmask_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);



irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action);

kernel/irq/irqdesc.c

+7 −0
Original line number Diff line number Diff line
@@ -299,6 +299,13 @@ static int irq_expand_nr_irqs(unsigned int nr) 
	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 */



/**