diff options
| author | Linus Torvalds | 2015-07-12 09:15:02 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2015-07-12 09:15:02 -0700 |
| commit | c4bc680cf7bcd257865dac97dd2debbc9dcffad4 (patch) | |
| tree | ceb5df05f889df160d04ebf952fc4c3e50de7981 /include/linux | |
| parent | 59c3cb553f5fc4ed6868eeaae6ffd8e1daf6d93e (diff) | |
| parent | a899418167264c7bac574b1a0f1b2c26c5b0995a (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner:
"A single fix for a cpu hotplug race vs. interrupt descriptors:
Prevent irq setup/teardown across the cpu starting/dying parts of cpu
hotplug so that the starting/dying cpu has a stable view of the
descriptor space. This has been an issue for all architectures in the
cpu dying phase, where interrupts are migrated away from the dying
cpu. In the starting phase its mostly a x86 issue vs the vector space
update"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hotplug: Prevent alloc/free of irq descriptors during cpu up/down
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/irqdesc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index 624a668e61f1..fcea4e48e21f 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -87,7 +87,12 @@ struct irq_desc { const char *name; } ____cacheline_internodealigned_in_smp; -#ifndef CONFIG_SPARSE_IRQ +#ifdef CONFIG_SPARSE_IRQ +extern void irq_lock_sparse(void); +extern void irq_unlock_sparse(void); +#else +static inline void irq_lock_sparse(void) { } +static inline void irq_unlock_sparse(void) { } extern struct irq_desc irq_desc[NR_IRQS]; #endif |