diff options
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r-- | arch/arm/kernel/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 2c4ff1cbe334..ec01f08f5642 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
@@ -112,7 +112,7 @@ static struct irq_desc bad_irq_desc = { | |||
112 | asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) | 112 | asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) |
113 | { | 113 | { |
114 | struct pt_regs *old_regs = set_irq_regs(regs); | 114 | struct pt_regs *old_regs = set_irq_regs(regs); |
115 | struct irqdesc *desc = irq_desc + irq; | 115 | struct irq_desc *desc = irq_desc + irq; |
116 | 116 | ||
117 | /* | 117 | /* |
118 | * Some hardware gives randomly wrong interrupts. Rather | 118 | * Some hardware gives randomly wrong interrupts. Rather |
@@ -134,7 +134,7 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) | |||
134 | 134 | ||
135 | void set_irq_flags(unsigned int irq, unsigned int iflags) | 135 | void set_irq_flags(unsigned int irq, unsigned int iflags) |
136 | { | 136 | { |
137 | struct irqdesc *desc; | 137 | struct irq_desc *desc; |
138 | unsigned long flags; | 138 | unsigned long flags; |
139 | 139 | ||
140 | if (irq >= NR_IRQS) { | 140 | if (irq >= NR_IRQS) { |
@@ -171,7 +171,7 @@ void __init init_IRQ(void) | |||
171 | 171 | ||
172 | #ifdef CONFIG_HOTPLUG_CPU | 172 | #ifdef CONFIG_HOTPLUG_CPU |
173 | 173 | ||
174 | static void route_irq(struct irqdesc *desc, unsigned int irq, unsigned int cpu) | 174 | static void route_irq(struct irq_desc *desc, unsigned int irq, unsigned int cpu) |
175 | { | 175 | { |
176 | pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu); | 176 | pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu); |
177 | 177 | ||
@@ -190,7 +190,7 @@ void migrate_irqs(void) | |||
190 | unsigned int i, cpu = smp_processor_id(); | 190 | unsigned int i, cpu = smp_processor_id(); |
191 | 191 | ||
192 | for (i = 0; i < NR_IRQS; i++) { | 192 | for (i = 0; i < NR_IRQS; i++) { |
193 | struct irqdesc *desc = irq_desc + i; | 193 | struct irq_desc *desc = irq_desc + i; |
194 | 194 | ||
195 | if (desc->cpu == cpu) { | 195 | if (desc->cpu == cpu) { |
196 | unsigned int newcpu = any_online_cpu(desc->affinity); | 196 | unsigned int newcpu = any_online_cpu(desc->affinity); |