aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/kernel/smp.c
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-05-25 11:48:14 -0400
committerJesper Nilsson <jesper.nilsson@axis.com>2010-05-25 11:48:14 -0400
commit4150764fbba03ce4675b02b10872c665bb05a8aa (patch)
treefb175c197b8bedf153c010d4320befc0d885f123 /arch/cris/arch-v32/kernel/smp.c
parent392ed655262446a7d9bc678394600a1d81614313 (diff)
CRIS: Don't use mask_irq as symbol name
kernel/irq/chip.c now uses these, which lead to compile error for CRISv32. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/arch-v32/kernel/smp.c')
-rw-r--r--arch/cris/arch-v32/kernel/smp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index 058adddf4e4b..84fed3b4b079 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -168,8 +168,8 @@ void __init smp_callin(void)
168 168
169 /* Enable IRQ and idle */ 169 /* Enable IRQ and idle */
170 REG_WR(intr_vect, irq_regs[cpu], rw_mask, vect_mask); 170 REG_WR(intr_vect, irq_regs[cpu], rw_mask, vect_mask);
171 unmask_irq(IPI_INTR_VECT); 171 crisv32_unmask_irq(IPI_INTR_VECT);
172 unmask_irq(TIMER0_INTR_VECT); 172 crisv32_unmask_irq(TIMER0_INTR_VECT);
173 preempt_disable(); 173 preempt_disable();
174 notify_cpu_starting(cpu); 174 notify_cpu_starting(cpu);
175 local_irq_enable(); 175 local_irq_enable();