[PATCH] irqchip: fix typo when moving gic_raise_softirq()

In b1cffebf (ARM: GIC: remove direct use of gic_raise_softirq)
gic_raise_softirq() was moved inside arch/arm/common/gic.c but in the
process it reverted by mistake a change to that function made by
384a290 (ARM: gic: use a private mapping for CPU target interfaces).
This breaks multicluster systems on ARM.

This patch fixes the typo.

Cc: Olof Johansson <redacted>
Cc: Rob Herring <redacted>
Signed-off-by: Javi Merino <redacted>
---
 drivers/irqchip/irq-gic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 644d724..a32e0d5 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c

@@ -648,7 +648,7 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
 
 	/* Convert our logical CPU mask into a physical one. */
 	for_each_cpu(cpu, mask)
-		map |= 1 << cpu_logical_map(cpu);
+		map |= gic_cpu_map[cpu];
 
 	/*
 	 * Ensure that stores to Normal memory are visible to the

-- 
1.7.9.5

On 02/19/2013 07:52 AM, Javi Merino wrote:

In b1cffebf (ARM: GIC: remove direct use of gic_raise_softirq)
gic_raise_softirq() was moved inside arch/arm/common/gic.c but in the
process it reverted by mistake a change to that function made by
384a290 (ARM: gic: use a private mapping for CPU target interfaces).
This breaks multicluster systems on ARM.

This patch fixes the typo.

Cc: Olof Johansson <redacted>
Cc: Rob Herring <redacted>
Signed-off-by: Javi Merino <redacted>

I wouldn't really call this a typo, but a rebasing error. Not really
important though, so:

Acked-by: Rob Herring <redacted>

On Tue, Feb 19, 2013 at 07:57:36AM -0600, Rob Herring wrote:

On 02/19/2013 07:52 AM, Javi Merino wrote:

quoted

In b1cffebf (ARM: GIC: remove direct use of gic_raise_softirq)
gic_raise_softirq() was moved inside arch/arm/common/gic.c but in the
process it reverted by mistake a change to that function made by
384a290 (ARM: gic: use a private mapping for CPU target interfaces).
This breaks multicluster systems on ARM.

This patch fixes the typo.

Cc: Olof Johansson <redacted>
Cc: Rob Herring <redacted>
Signed-off-by: Javi Merino <redacted>

I wouldn't really call this a typo, but a rebasing error. Not really
important though, so:

Acked-by: Rob Herring <redacted>

Applied.


-Olof