commit 242954b5aa8e5ec84f46a84637daf08ee4247c6e
author Ralf Baechle <ralf@linux-mips.org> Tue Oct 24 02:29:01 2006 +0100
committer Ralf Baechle <ralf@linux-mips.org> Wed Nov 01 17:46:09 2006 +0000
tree 7fb896349b377f5f819d4050bb92eeee05598571
parent 4b1c46a383aafc137bc91a0f9698bfc11e062d1b

[MIPS] 16K & 64K page size fixes

Derived from Peter Watkins <treestem@gmail.com>'s work.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/kernel/r4k_switch.S

diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index d5c8b82..cc566cf 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -85,7 +85,12 @@
 	move	$28, a2
 	cpu_restore_nonscratch a1
 
+#if (_THREAD_SIZE - 32) < 0x10000
 	PTR_ADDIU	t0, $28, _THREAD_SIZE - 32
+#else
+	PTR_LI		t0, _THREAD_SIZE - 32
+	PTR_ADDU	t0, $28
+#endif
 	set_saved_sp	t0, t1, t2
 #ifdef CONFIG_MIPS_MT_SMTC
 	/* Read-modify-writes of Status must be atomic on a VPE */