Revert "arm/arm64: irq: warn only when affinity really breaks"

This reverts commit 92b09f2deb6b0b2e54b3abb7cb7f92d9e0b48c68.
This commit is contained in:
syphyr 2018-07-25 03:15:04 +02:00
parent 679b06f980
commit e5f5540221
2 changed files with 4 additions and 15 deletions

View File

@ -155,7 +155,6 @@ static bool migrate_one_irq(struct irq_desc *desc)
{
struct irq_data *d = irq_desc_get_irq_data(desc);
const struct cpumask *affinity = d->affinity;
bool ret = false;
/*
* If this is a per-CPU interrupt, or the affinity does not
@ -164,14 +163,10 @@ static bool migrate_one_irq(struct irq_desc *desc)
if (irqd_is_per_cpu(d) || !cpumask_test_cpu(smp_processor_id(), affinity))
return false;
if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids)
affinity = cpu_online_mask;
ret = true;
}
irq_set_affinity_locked(d, affinity, 0);
return ret;
return irq_set_affinity_locked(d, affinity, false) == IRQ_SET_MASK_OK;
}
/*

View File

@ -99,7 +99,6 @@ static bool migrate_one_irq(struct irq_desc *desc)
{
struct irq_data *d = irq_desc_get_irq_data(desc);
const struct cpumask *affinity = d->affinity;
bool ret = false;
/*
* If this is a per-CPU interrupt, or the affinity does not
@ -108,14 +107,9 @@ static bool migrate_one_irq(struct irq_desc *desc)
if (irqd_is_per_cpu(d) || !cpumask_test_cpu(smp_processor_id(), affinity))
return false;
if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {
if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids)
affinity = cpu_online_mask;
ret = true;
}
irq_set_affinity_locked(d, affinity, 0);
return ret;
return irq_set_affinity_locked(d, affinity, 0) == 0;
}
/*