diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-20 14:18:04 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-20 14:18:04 +0900 |
commit | 3f017a4ca2de0a87767ab047b2bd2f3f11e87a9e (patch) | |
tree | 150789c3c0e0b443815e4a5bd56f8543c085207b /include | |
parent | 14186fea0cb06bc43181ce239efe0df6f1af260a (diff) | |
parent | 2ed9fd28c2884e9f41c133f86a7e377d7c0a96bf (diff) | |
download | linux-3f017a4ca2de0a87767ab047b2bd2f3f11e87a9e.tar.bz2 |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"Two small updates from the irq departement:
- Provide missing inline stub for a SMP only function
- Add sub-maintainer for the drivers/irqchip/ part of the irq
subsystem. YAY!"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
MAINTAINERS: Add co-maintainer for drivers/irqchip
genirq: Provide irq_force_affinity fallback for non-SMP
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/interrupt.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 97ac926c78a7..051c85032f48 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -272,6 +272,11 @@ static inline int irq_set_affinity(unsigned int irq, const struct cpumask *m) return -EINVAL; } +static inline int irq_force_affinity(unsigned int irq, const struct cpumask *cpumask) +{ + return 0; +} + static inline int irq_can_set_affinity(unsigned int irq) { return 0; |