summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/r2300_switch.S
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-04-05 11:23:36 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-04-05 11:23:36 +0000
commit4318fbda2a7ee51caafdc4eb1f8028a3f0605142 (patch)
treecddb50a81d7d1a628cc400519162080c6d87868e /arch/mips/kernel/r2300_switch.S
parent36ea5120664550fae6d31f1c6f695e4f8975cb06 (diff)
o Merge with Linux 2.1.91.
o First round of bugfixes for the SC/MC CPUs. o FPU context switch fixes. o Lazy context switches. o Faster syscalls. o Removed dead code. o Shitloads of other things I forgot ...
Diffstat (limited to 'arch/mips/kernel/r2300_switch.S')
-rw-r--r--arch/mips/kernel/r2300_switch.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S
index f4470e54d..b2b55bf0b 100644
--- a/arch/mips/kernel/r2300_switch.S
+++ b/arch/mips/kernel/r2300_switch.S
@@ -6,7 +6,7 @@
* Multi-cpu abstraction and macros for easier reading:
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
*
- * $Id: r2300_switch.S,v 1.3 1998/03/23 06:34:37 ralf Exp $
+ * $Id: r2300_switch.S,v 1.3 1998/03/27 04:47:55 ralf Exp $
*/
#include <asm/asm.h>
#include <asm/bootinfo.h>
@@ -83,8 +83,8 @@ MODE_ALIAS = 0x00e0 # uncachable, dirty, valid
FPU_RESTORE($28, t0)
1:
CPU_RESTORE_NONSCRATCH($28)
- lw t0,THREAD_KSP($28) # Restore status register
+ addiu t0, $28, KERNEL_STACK_SIZE-32
sw t0,kernelsp
jr ra
- mtc0 a2,CP0_STATUS
+ mtc0 a2,CP0_STATUS # Restore status register
END(r2300_resume)