IRQ fixes
Linus,
Please pull the latest irq-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus
# HEAD: 4ce413d1840b25b101be3c0559161db8891f3360 irqdesc: Use bool return type instead of int
Two fixes: use bool type consistently, plus a irq_matrix_available() bugfix.
Thanks,
Ingo
------------------>
Thomas Gleixner (1):
genirq/matrix: Fix the precedence fix for real
Will Deacon (1):
irqdesc: Use bool return type instead of int
include/linux/irqdesc.h | 6 +++--- kernel/irq/matrix.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-)
include/linux/irqdesc.h +3 -3
@@ -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;
kernel/irq/matrix.c +3 -1
@@ -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; }/**