Commit da92b4eb authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner

powerpc, irq: Use access helper irq_data_get_affinity_mask()

Use access helper irq_data_get_affinity_mask() so we can move the
affinity mask to irq_common_data.
Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/1433145945-789-25-git-send-email-jiang.liu@linux.intel.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b838c950
...@@ -441,7 +441,7 @@ void migrate_irqs(void) ...@@ -441,7 +441,7 @@ void migrate_irqs(void)
chip = irq_data_get_irq_chip(data); chip = irq_data_get_irq_chip(data);
cpumask_and(mask, data->affinity, map); cpumask_and(mask, irq_data_get_affinity_mask(data), map);
if (cpumask_any(mask) >= nr_cpu_ids) { if (cpumask_any(mask) >= nr_cpu_ids) {
pr_warn("Breaking affinity for irq %i\n", irq); pr_warn("Breaking affinity for irq %i\n", irq);
cpumask_copy(mask, map); cpumask_copy(mask, map);
......
...@@ -54,7 +54,7 @@ static void ics_opal_unmask_irq(struct irq_data *d) ...@@ -54,7 +54,7 @@ static void ics_opal_unmask_irq(struct irq_data *d)
if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS) if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
return; return;
server = xics_get_irq_server(d->irq, d->affinity, 0); server = xics_get_irq_server(d->irq, irq_data_get_affinity_mask(d), 0);
server = ics_opal_mangle_server(server); server = ics_opal_mangle_server(server);
rc = opal_set_xive(hw_irq, server, DEFAULT_PRIORITY); rc = opal_set_xive(hw_irq, server, DEFAULT_PRIORITY);
......
...@@ -47,7 +47,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d) ...@@ -47,7 +47,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d)
if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS) if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
return; return;
server = xics_get_irq_server(d->irq, d->affinity, 0); server = xics_get_irq_server(d->irq, irq_data_get_affinity_mask(d), 0);
call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hw_irq, server, call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hw_irq, server,
DEFAULT_PRIORITY); DEFAULT_PRIORITY);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment