diff options
Diffstat (limited to 'arch/mips/kernel/smtc.c')
-rw-r--r-- | arch/mips/kernel/smtc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 9c92d42996cb..b42e71c71119 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <asm/hazards.h> | 16 | #include <asm/hazards.h> |
17 | #include <asm/irq.h> | 17 | #include <asm/irq.h> |
18 | #include <asm/mmu_context.h> | 18 | #include <asm/mmu_context.h> |
19 | #include <asm/smp.h> | ||
20 | #include <asm/mipsregs.h> | 19 | #include <asm/mipsregs.h> |
21 | #include <asm/cacheflush.h> | 20 | #include <asm/cacheflush.h> |
22 | #include <asm/time.h> | 21 | #include <asm/time.h> |
@@ -66,7 +65,7 @@ asiduse smtc_live_asid[MAX_SMTC_TLBS][MAX_SMTC_ASIDS]; | |||
66 | static atomic_t ipi_timer_latch[NR_CPUS]; | 65 | static atomic_t ipi_timer_latch[NR_CPUS]; |
67 | 66 | ||
68 | /* | 67 | /* |
69 | * Number of InterProcessor Interupt (IPI) message buffers to allocate | 68 | * Number of InterProcessor Interrupt (IPI) message buffers to allocate |
70 | */ | 69 | */ |
71 | 70 | ||
72 | #define IPIBUF_PER_CPU 4 | 71 | #define IPIBUF_PER_CPU 4 |
@@ -781,7 +780,7 @@ void smtc_send_ipi(int cpu, int type, unsigned int action) | |||
781 | if (cpu_data[cpu].vpe_id != cpu_data[smp_processor_id()].vpe_id) { | 780 | if (cpu_data[cpu].vpe_id != cpu_data[smp_processor_id()].vpe_id) { |
782 | if (type == SMTC_CLOCK_TICK) | 781 | if (type == SMTC_CLOCK_TICK) |
783 | atomic_inc(&ipi_timer_latch[cpu]); | 782 | atomic_inc(&ipi_timer_latch[cpu]); |
784 | /* If not on same VPE, enqueue and send cross-VPE interupt */ | 783 | /* If not on same VPE, enqueue and send cross-VPE interrupt */ |
785 | smtc_ipi_nq(&IPIQ[cpu], pipi); | 784 | smtc_ipi_nq(&IPIQ[cpu], pipi); |
786 | LOCK_CORE_PRA(); | 785 | LOCK_CORE_PRA(); |
787 | settc(cpu_data[cpu].tc_id); | 786 | settc(cpu_data[cpu].tc_id); |
@@ -1064,7 +1063,7 @@ static void setup_cross_vpe_interrupts(unsigned int nvpe) | |||
1064 | return; | 1063 | return; |
1065 | 1064 | ||
1066 | if (!cpu_has_vint) | 1065 | if (!cpu_has_vint) |
1067 | panic("SMTC Kernel requires Vectored Interupt support"); | 1066 | panic("SMTC Kernel requires Vectored Interrupt support"); |
1068 | 1067 | ||
1069 | set_vi_handler(MIPS_CPU_IPI_IRQ, ipi_irq_dispatch); | 1068 | set_vi_handler(MIPS_CPU_IPI_IRQ, ipi_irq_dispatch); |
1070 | 1069 | ||