summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/smtc-asm.S
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-10-31 22:49:04 +0000
committerRalf Baechle <ralf@linux-mips.org>2006-11-01 17:46:09 +0000
commitcb56837ea5f15fa5279fd490f292134c3a92e5de (patch)
treea6da64b1906b9459888687fc28f0bccdbe96ce42 /arch/mips/kernel/smtc-asm.S
parent242954b5aa8e5ec84f46a84637daf08ee4247c6e (diff)
[MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/smtc-asm.S')
-rw-r--r--arch/mips/kernel/smtc-asm.S7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/mips/kernel/smtc-asm.S b/arch/mips/kernel/smtc-asm.S
index 1cb9441f147..921207c4a83 100644
--- a/arch/mips/kernel/smtc-asm.S
+++ b/arch/mips/kernel/smtc-asm.S
@@ -101,7 +101,9 @@ FEXPORT(__smtc_ipi_vector)
lw t0,PT_PADSLOT5(sp)
/* Argument from sender passed in stack pad slot 4 */
lw a0,PT_PADSLOT4(sp)
- PTR_LA ra, _ret_from_irq
+ LONG_L s0, TI_REGS($28)
+ LONG_S sp, TI_REGS($28)
+ PTR_LA ra, ret_from_irq
jr t0
/*
@@ -119,7 +121,10 @@ LEAF(self_ipi)
subu t1,sp,PT_SIZE
sw ra,PT_EPC(t1)
sw a0,PT_PADSLOT4(t1)
+ LONG_L s0, TI_REGS($28)
+ LONG_S sp, TI_REGS($28)
la t2,ipi_decode
+ LONG_S s0, TI_REGS($28)
sw t2,PT_PADSLOT5(t1)
/* Save pre-disable value of TCStatus */
sw t0,PT_TCSTATUS(t1)