diff mbox

ARM64/irq: Use access helper irq_data_get_affinity_mask()

Message ID 20150713100010.928355574@linutronix.de (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Gleixner July 13, 2015, 8:30 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>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/arm64/kernel/irq.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Catalin Marinas July 14, 2015, 9:07 a.m. UTC | #1 
Hi Thomas,

On Mon, Jul 13, 2015 at 08:30:04PM -0000, Thomas Gleixner wrote:
> 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>
> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

What's the plan with this patch? Do you get it via your tree together
with other patches or we should merge it via the arm64 tree? If the
former:

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Thomas Gleixner July 14, 2015, 9:10 a.m. UTC | #2 
On Tue, 14 Jul 2015, Catalin Marinas wrote:
> Hi Thomas,
> 
> On Mon, Jul 13, 2015 at 08:30:04PM -0000, Thomas Gleixner wrote:
> > 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>
> > Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
> > Cc: linux-arm-kernel@lists.infradead.org
> > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> 
> What's the plan with this patch? Do you get it via your tree together
> with other patches or we should merge it via the arm64 tree? If the

Just push it through arm64, please.

Thanks,

	tglx
diff mbox

Patch

Index: tip/arch/arm64/kernel/irq.c
===================================================================
--- tip.orig/arch/arm64/kernel/irq.c
+++ tip/arch/arm64/kernel/irq.c
@@ -61,7 +61,7 @@  void __init init_IRQ(void)
 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;
+	const struct cpumask *affinity = irq_data_get_affinity_mask(d);
 	struct irq_chip *c;
 	bool ret = false;
 
@@ -81,7 +81,7 @@  static bool migrate_one_irq(struct irq_d
 	if (!c->irq_set_affinity)
 		pr_debug("IRQ%u: unable to set affinity\n", d->irq);
 	else if (c->irq_set_affinity(d, affinity, false) == IRQ_SET_MASK_OK && ret)
-		cpumask_copy(d->affinity, affinity);
+		cpumask_copy(irq_data_get_affinity_mask(d), affinity);
 
 	return ret;
 }