diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-11 03:32:21 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-12 12:41:05 -0400 |
| commit | 3bd39664481fc51d82e58a3bec6ba77febc7dfae (patch) | |
| tree | 77c76d35694a14fb99dffe0977dc1e89ddc52069 /arch/mips/kernel | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
[MIPS] Fix resume for 64K page size on R4000 class processors.
Problem reported by Peter Watkins <pwatkins@sicortex.com> but this is
a different fix.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/r4k_switch.S | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 06729596812f..d9bfae53c43f 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
| @@ -85,12 +85,7 @@ | |||
| 85 | move $28, a2 | 85 | move $28, a2 |
| 86 | cpu_restore_nonscratch a1 | 86 | cpu_restore_nonscratch a1 |
| 87 | 87 | ||
| 88 | #if (_THREAD_SIZE - 32) < 0x10000 | 88 | PTR_ADDU t0, $28, _THREAD_SIZE - 32 |
| 89 | PTR_ADDIU t0, $28, _THREAD_SIZE - 32 | ||
| 90 | #else | ||
| 91 | PTR_LI t0, _THREAD_SIZE - 32 | ||
| 92 | PTR_ADDU t0, $28 | ||
| 93 | #endif | ||
| 94 | set_saved_sp t0, t1, t2 | 89 | set_saved_sp t0, t1, t2 |
| 95 | #ifdef CONFIG_MIPS_MT_SMTC | 90 | #ifdef CONFIG_MIPS_MT_SMTC |
| 96 | /* Read-modify-writes of Status must be atomic on a VPE */ | 91 | /* Read-modify-writes of Status must be atomic on a VPE */ |