diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-02-02 13:38:03 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-02-02 13:38:03 +0100 |
| commit | 43328a22788c8d856f30a9b0b909e00b7a0c6ecc (patch) | |
| tree | 1ef1604ea6a297c5b83d3821ba19757946d7e67f /kernel/irq/internals.h | |
| parent | 7a615209551c7a9f3a0dea4f6341ebbb2f2dc9c9 (diff) | |
| parent | c2d6598eefba9cbe5ca69ab6ca59e31f797169ac (diff) | |
Merge tag 'v3.18.5' into toradex_vf_3.18-next
This is the 3.18.5 stable release
Conflicts:
arch/arm/mach-imx/clk-imx6q.c
Diffstat (limited to 'kernel/irq/internals.h')
| -rw-r--r-- | kernel/irq/internals.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index 4332d766619d..df553b0af936 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -78,8 +78,12 @@ extern void unmask_threaded_irq(struct irq_desc *desc); #ifdef CONFIG_SPARSE_IRQ static inline void irq_mark_irq(unsigned int irq) { } +extern void irq_lock_sparse(void); +extern void irq_unlock_sparse(void); #else extern void irq_mark_irq(unsigned int irq); +static inline void irq_lock_sparse(void) { } +static inline void irq_unlock_sparse(void) { } #endif extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr); |