From: Ralf Baechle Date: Wed, 11 Jul 2007 07:32:21 +0000 (+0100) Subject: [MIPS] Fix resume for 64K page size on R4000 class processors. X-Git-Tag: v2.6.23-rc1~1110^2~18 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3bd39664481fc51d82e58a3bec6ba77febc7dfae;p=linux-2.6-omap-h63xx.git [MIPS] Fix resume for 64K page size on R4000 class processors. Problem reported by Peter Watkins but this is a different fix. Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 06729596812..d9bfae53c43 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S @@ -85,12 +85,7 @@ 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 + PTR_ADDU t0, $28, _THREAD_SIZE - 32 set_saved_sp t0, t1, t2 #ifdef CONFIG_MIPS_MT_SMTC /* Read-modify-writes of Status must be atomic on a VPE */