Skip to content

Commit

Permalink
powerpc, irq: Use access helper irq_data_get_affinity_mask()
Browse files Browse the repository at this point in the history
Use access helper irq_data_get_affinity_mask() so we can move the
affinity mask to irq_common_data.

Signed-off-by: Jiang 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.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Jiang Liu authored and Thomas Gleixner committed Sep 15, 2015
1 parent b838c95 commit da92b4e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ void migrate_irqs(void)

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) {
pr_warn("Breaking affinity for irq %i\n", irq);
cpumask_copy(mask, map);
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/sysdev/xics/ics-opal.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static void ics_opal_unmask_irq(struct irq_data *d)
if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
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);

rc = opal_set_xive(hw_irq, server, DEFAULT_PRIORITY);
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/sysdev/xics/ics-rtas.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d)
if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
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,
DEFAULT_PRIORITY);
Expand Down

0 comments on commit da92b4e

Please sign in to comment.