diff mbox

[13/20] powerpc/irq: Use access helper irq_data_get_affinity_mask()

Message ID 20150713135740.079385036@linutronix.de (mailing list archive)
State Not Applicable
Headers show

Commit Message

Thomas Gleixner July 13, 2015, 8:50 p.m. UTC 
From: Jiang Liu <jiang.liu@linux.intel.com>

This is a preparatory patch for moving irq_data struct members.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/powerpc/kernel/irq.c           |    2 +-
 arch/powerpc/sysdev/xics/ics-opal.c |    2 +-
 arch/powerpc/sysdev/xics/ics-rtas.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
diff mbox

Patch

Index: tip/arch/powerpc/kernel/irq.c
===================================================================
--- tip.orig/arch/powerpc/kernel/irq.c
+++ tip/arch/powerpc/kernel/irq.c
@@ -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);
Index: tip/arch/powerpc/sysdev/xics/ics-opal.c
===================================================================
--- tip.orig/arch/powerpc/sysdev/xics/ics-opal.c
+++ tip/arch/powerpc/sysdev/xics/ics-opal.c
@@ -54,7 +54,7 @@  static void ics_opal_unmask_irq(struct i
 	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);
Index: tip/arch/powerpc/sysdev/xics/ics-rtas.c
===================================================================
--- tip.orig/arch/powerpc/sysdev/xics/ics-rtas.c
+++ tip/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -47,7 +47,7 @@  static void ics_rtas_unmask_irq(struct i
 	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);