diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-24 21:57:07 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-24 21:57:07 +0300 |
| commit | 43d368a18f046587bc6ac44239fbef183242989b (patch) | |
| tree | bfe55fe55a5f0914cbcb8afdb00942d6c16304a5 /include | |
| parent | a4306434b79ffc859e5dc6ab0f305a3d8204ef46 (diff) | |
| parent | cf00ab842eec7cd4923a3f0f3b5ddcead9b11306 (diff) | |
| download | linux-43d368a18f046587bc6ac44239fbef183242989b.tar.xz | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar:
"Three irqchip driver fixes, and an affinity mask helper function bug
fix affecting x86"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "genirq: Restrict effective affinity to interrupts actually using it"
irqchip.mips-gic: Fix shared interrupt mask writes
irqchip/gic-v4: Fix building with ancient gcc
irqchip/gic-v3: Iterate over possible CPUs by for_each_possible_cpu()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irq.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index b99a784635ff..d4728bf6a537 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -783,10 +783,7 @@ static inline struct cpumask *irq_data_get_affinity_mask(struct irq_data *d) static inline struct cpumask *irq_data_get_effective_affinity_mask(struct irq_data *d) { - if (!cpumask_empty(d->common->effective_affinity)) - return d->common->effective_affinity; - - return d->common->affinity; + return d->common->effective_affinity; } static inline void irq_data_update_effective_affinity(struct irq_data *d, const struct cpumask *m) |