projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
[cascardo/linux.git]
/
arch
/
mips
/
kernel
/
r4k_switch.S
diff --git
a/arch/mips/kernel/r4k_switch.S
b/arch/mips/kernel/r4k_switch.S
index
0672959
..
d9bfae5
100644
(file)
--- 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
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 */
set_saved_sp t0, t1, t2
#ifdef CONFIG_MIPS_MT_SMTC
/* Read-modify-writes of Status must be atomic on a VPE */