git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ec' into release
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kernel
/
octeon_switch.S
diff --git
a/arch/mips/kernel/octeon_switch.S
b/arch/mips/kernel/octeon_switch.S
index d52389672b06def47bd135992fecccd379f00ab3..3952b8323efac5d3017c86bc99a4b72434fe66d3 100644
(file)
--- a/
arch/mips/kernel/octeon_switch.S
+++ b/
arch/mips/kernel/octeon_switch.S
@@
-36,9
+36,6
@@
.align 7
LEAF(resume)
.set arch=octeon
-#ifndef CONFIG_CPU_HAS_LLSC
- sw zero, ll_bit
-#endif
mfc0 t1, CP0_STATUS
LONG_S t1, THREAD_STATUS(a0)
cpu_save_nonscratch a0