diff options
Diffstat (limited to 'arch/mips/kernel/smp-mt.c')
-rw-r--r-- | arch/mips/kernel/smp-mt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c index 21f23add04f4..ad86951b73bd 100644 --- a/arch/mips/kernel/smp-mt.c +++ b/arch/mips/kernel/smp-mt.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
22 | #include <linux/cpumask.h> | 22 | #include <linux/cpumask.h> |
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | #include <linux/irqchip/mips-gic.h> | ||
24 | #include <linux/compiler.h> | 25 | #include <linux/compiler.h> |
25 | #include <linux/smp.h> | 26 | #include <linux/smp.h> |
26 | 27 | ||
@@ -34,7 +35,6 @@ | |||
34 | #include <asm/mipsregs.h> | 35 | #include <asm/mipsregs.h> |
35 | #include <asm/mipsmtregs.h> | 36 | #include <asm/mipsmtregs.h> |
36 | #include <asm/mips_mt.h> | 37 | #include <asm/mips_mt.h> |
37 | #include <asm/gic.h> | ||
38 | 38 | ||
39 | static void __init smvp_copy_vpe_config(void) | 39 | static void __init smvp_copy_vpe_config(void) |
40 | { | 40 | { |
@@ -119,7 +119,7 @@ static void vsmp_send_ipi_single(int cpu, unsigned int action) | |||
119 | unsigned long flags; | 119 | unsigned long flags; |
120 | int vpflags; | 120 | int vpflags; |
121 | 121 | ||
122 | #ifdef CONFIG_IRQ_GIC | 122 | #ifdef CONFIG_MIPS_GIC |
123 | if (gic_present) { | 123 | if (gic_present) { |
124 | gic_send_ipi_single(cpu, action); | 124 | gic_send_ipi_single(cpu, action); |
125 | return; | 125 | return; |
@@ -158,7 +158,7 @@ static void vsmp_send_ipi_mask(const struct cpumask *mask, unsigned int action) | |||
158 | 158 | ||
159 | static void vsmp_init_secondary(void) | 159 | static void vsmp_init_secondary(void) |
160 | { | 160 | { |
161 | #ifdef CONFIG_IRQ_GIC | 161 | #ifdef CONFIG_MIPS_GIC |
162 | /* This is Malta specific: IPI,performance and timer interrupts */ | 162 | /* This is Malta specific: IPI,performance and timer interrupts */ |
163 | if (gic_present) | 163 | if (gic_present) |
164 | change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 | | 164 | change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 | |