Skip to contentSkip to conversation

irqchip: fix typo when moving gic_raise_softirq()

PATCH New Javi Merino 3 participants 3 messages Feb 19, 2013 – Feb 26, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Rob Herring <[email protected]>
---
 drivers/irqchip/irq-gic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic.c +1 -1
index 644d724..a32e0d5 100644
@@ -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
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 irqchip: fix typo when moving gic_raise_softirq()

Quoted 11 lines · Javi Merino

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 <[email protected]>
Cc Rob Herring <[email protected]>

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

Quoted 18 lines
---
 drivers/irqchip/irq-gic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic.c +1 -1
index 644d724..a32e0d5 100644
@@ -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
#2 lore raw

PATCH 1/1 irqchip: fix typo when moving gic_raise_softirq()

Quoted 9 lines · Rob Herring
Quoted 8 lines · Javi Merino

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.

Quoted 8 lines
Quoted 3 lines
Cc Olof Johansson <[email protected]>
Cc Rob Herring <[email protected]>

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

Applied.

-Olof