diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-06 15:47:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-06 15:47:51 -0800 |
| commit | 61d6be3a7a1139285e16a672be72caefd4b1126b (patch) | |
| tree | d1203b382576b0d33c1d0c5d66e4c1f4cd61dd73 | |
| parent | dabe589657ad0f9a0d6f4101e2171574f74b00bf (diff) | |
| parent | 4ce413d1840b25b101be3c0559161db8891f3360 (diff) | |
| download | linux-digsig-61d6be3a7a1139285e16a672be72caefd4b1126b.tar.gz | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar:
"Two fixes: use bool type consistently, plus a irq_matrix_available()
bugfix"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqdesc: Use bool return type instead of int
genirq/matrix: Fix the precedence fix for real
| -rw-r--r-- | include/linux/irqdesc.h | 6 | ||||
| -rw-r--r-- | kernel/irq/matrix.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index dd418955962bc..39fb3700f7a92 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -230,7 +230,7 @@ irq_set_chip_handler_name_locked(struct irq_data *data, struct irq_chip *chip, data->chip = chip; } -static inline int irq_balancing_disabled(unsigned int irq) +static inline bool irq_balancing_disabled(unsigned int irq) { struct irq_desc *desc; @@ -238,7 +238,7 @@ static inline int irq_balancing_disabled(unsigned int irq) return desc->status_use_accessors & IRQ_NO_BALANCING_MASK; } -static inline int irq_is_percpu(unsigned int irq) +static inline bool irq_is_percpu(unsigned int irq) { struct irq_desc *desc; @@ -246,7 +246,7 @@ static inline int irq_is_percpu(unsigned int irq) return desc->status_use_accessors & IRQ_PER_CPU; } -static inline int irq_is_percpu_devid(unsigned int irq) +static inline bool irq_is_percpu_devid(unsigned int irq) { struct irq_desc *desc; diff --git a/kernel/irq/matrix.c b/kernel/irq/matrix.c index 7df2480005f86..0ba0dd8863a77 100644 --- a/kernel/irq/matrix.c +++ b/kernel/irq/matrix.c @@ -384,7 +384,9 @@ unsigned int irq_matrix_available(struct irq_matrix *m, bool cpudown) { struct cpumap *cm = this_cpu_ptr(m->maps); - return (m->global_available - cpudown) ? cm->available : 0; + if (!cpudown) + return m->global_available; + return m->global_available - cm->available; } /** |