Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41184f6a authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[ARM] 5556/1: Fix the irq_desc.cpu references 



The cpu member of struct irq_desc was recently renamed to node. The
patch renames the ARM references to the old member.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c3c21740

arch/arm/common/gic.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int gic_set_cpu(unsigned int irq, const struct cpumask *mask_val) 
	u32 val;



	spin_lock(&irq_controller_lock);

	irq_desc[irq].cpu = cpu;

	irq_desc[irq].node = cpu;

	val = readl(reg) & ~(0xff << shift);

	val |= 1 << (cpu + shift);

	writel(val, reg);

arch/arm/kernel/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ void __init init_IRQ(void) 


#ifdef CONFIG_SMP

	cpumask_setall(bad_irq_desc.affinity);

	bad_irq_desc.cpu = smp_processor_id();

	bad_irq_desc.node = smp_processor_id();

#endif

	init_arch_irq();

}
@@ -176,7 +176,7 @@ void __init init_IRQ(void) 


static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu)

{

	pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu);

	pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->node, cpu);



	spin_lock_irq(&desc->lock);

	desc->chip->set_affinity(irq, cpumask_of(cpu));
@@ -195,7 +195,7 @@ void migrate_irqs(void) 
	for (i = 0; i < NR_IRQS; i++) {

		struct irq_desc *desc = irq_desc + i;



		if (desc->cpu == cpu) {

		if (desc->node == cpu) {

			unsigned int newcpu = cpumask_any_and(desc->affinity,

							      cpu_online_mask);

			if (newcpu >= nr_cpu_ids) {