Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 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>

authored by

Jiang Liu and committed by
Thomas Gleixner
da92b4eb b838c950

+3 -3
+1 -1
arch/powerpc/kernel/irq.c
··· 441 441 442 442 chip = irq_data_get_irq_chip(data); 443 443 444 - cpumask_and(mask, data->affinity, map); 444 + cpumask_and(mask, irq_data_get_affinity_mask(data), map); 445 445 if (cpumask_any(mask) >= nr_cpu_ids) { 446 446 pr_warn("Breaking affinity for irq %i\n", irq); 447 447 cpumask_copy(mask, map);
+1 -1
arch/powerpc/sysdev/xics/ics-opal.c
··· 54 54 if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS) 55 55 return; 56 56 57 - server = xics_get_irq_server(d->irq, d->affinity, 0); 57 + server = xics_get_irq_server(d->irq, irq_data_get_affinity_mask(d), 0); 58 58 server = ics_opal_mangle_server(server); 59 59 60 60 rc = opal_set_xive(hw_irq, server, DEFAULT_PRIORITY);
+1 -1
arch/powerpc/sysdev/xics/ics-rtas.c
··· 47 47 if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS) 48 48 return; 49 49 50 - server = xics_get_irq_server(d->irq, d->affinity, 0); 50 + server = xics_get_irq_server(d->irq, irq_data_get_affinity_mask(d), 0); 51 51 52 52 call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hw_irq, server, 53 53 DEFAULT_PRIORITY);