mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
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
This commit is contained in:
commit
61d6be3a7a
2 changed files with 6 additions and 4 deletions
|
@ -230,7 +230,7 @@ irq_set_chip_handler_name_locked(struct irq_data *data, struct irq_chip *chip,
|
||||||
data->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;
|
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;
|
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;
|
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;
|
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;
|
struct irq_desc *desc;
|
||||||
|
|
||||||
|
|
|
@ -384,7 +384,9 @@ unsigned int irq_matrix_available(struct irq_matrix *m, bool cpudown)
|
||||||
{
|
{
|
||||||
struct cpumap *cm = this_cpu_ptr(m->maps);
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue