Parm 'force' has been ignored, and currently no one need a 'true' option, so remove it to make code clean.
CC: Thomas Gleixner <t...@linutronix.de> CC: Ingo Molnar <mi...@redhat.com> CC: Peter Zijlstra <pet...@infradead.org> Signed-off-by: Michael Wang <wang...@linux.vnet.ibm.com> --- kernel/irq/internals.h | 2 +- kernel/irq/manage.c | 7 +++---- kernel/irq/migration.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index 001fa5b..c5b4085 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -102,7 +102,7 @@ extern int irq_select_affinity_usr(unsigned int irq, struct cpumask *mask); extern void irq_set_thread_affinity(struct irq_desc *desc); extern int irq_do_set_affinity(struct irq_data *data, - const struct cpumask *dest, bool force); + const struct cpumask *dest); /* Inline functions for support of irq chips on slow busses */ static inline void chip_bus_lock(struct irq_desc *desc) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 46941e7..9a71ba5 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -143,8 +143,7 @@ static inline void irq_get_pending(struct cpumask *mask, struct irq_desc *desc) { } #endif -int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask, - bool force) +int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask) { struct irq_desc *desc = irq_data_to_desc(data); struct irq_chip *chip = irq_data_get_irq_chip(data); @@ -172,7 +171,7 @@ int __irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask) return -EINVAL; if (irq_can_move_pcntxt(data)) { - ret = irq_do_set_affinity(data, mask, false); + ret = irq_do_set_affinity(data, mask); } else { irqd_set_move_pending(data); irq_copy_pending(desc, mask); @@ -323,7 +322,7 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) if (cpumask_intersects(mask, nodemask)) cpumask_and(mask, mask, nodemask); } - irq_do_set_affinity(&desc->irq_data, mask, false); + irq_do_set_affinity(&desc->irq_data, mask); return 0; } #else diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index ca3f4aa..4790949 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c @@ -43,7 +43,7 @@ void irq_move_masked_irq(struct irq_data *idata) * masking the irqs. */ if (cpumask_any_and(desc->pending_mask, cpu_online_mask) < nr_cpu_ids) - irq_do_set_affinity(&desc->irq_data, desc->pending_mask, false); + irq_do_set_affinity(&desc->irq_data, desc->pending_mask); cpumask_clear(desc->pending_mask); } -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/