Commit a91be9ee authored by Ralf Baechle's avatar Ralf Baechle

MIPS: Fix MIPS I build.

Broken by d63c63e889bbeeaa461a8addf1245f89f3ce4ece (lmo) rsp.
f1e39a4a (kernel.org).
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/746/
parent 21278163
...@@ -306,6 +306,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, ...@@ -306,6 +306,7 @@ static inline int mips_atomic_set(struct pt_regs *regs,
if (cpu_has_llsc && R10000_LLSC_WAR) { if (cpu_has_llsc && R10000_LLSC_WAR) {
__asm__ __volatile__ ( __asm__ __volatile__ (
" .set mips3 \n"
" li %[err], 0 \n" " li %[err], 0 \n"
"1: ll %[old], (%[addr]) \n" "1: ll %[old], (%[addr]) \n"
" move %[tmp], %[new] \n" " move %[tmp], %[new] \n"
...@@ -320,6 +321,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, ...@@ -320,6 +321,7 @@ static inline int mips_atomic_set(struct pt_regs *regs,
" "STR(PTR)" 1b, 4b \n" " "STR(PTR)" 1b, 4b \n"
" "STR(PTR)" 2b, 4b \n" " "STR(PTR)" 2b, 4b \n"
" .previous \n" " .previous \n"
" .set mips0 \n"
: [old] "=&r" (old), : [old] "=&r" (old),
[err] "=&r" (err), [err] "=&r" (err),
[tmp] "=&r" (tmp) [tmp] "=&r" (tmp)
...@@ -329,6 +331,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, ...@@ -329,6 +331,7 @@ static inline int mips_atomic_set(struct pt_regs *regs,
: "memory"); : "memory");
} else if (cpu_has_llsc) { } else if (cpu_has_llsc) {
__asm__ __volatile__ ( __asm__ __volatile__ (
" .set mips3 \n"
" li %[err], 0 \n" " li %[err], 0 \n"
"1: ll %[old], (%[addr]) \n" "1: ll %[old], (%[addr]) \n"
" move %[tmp], %[new] \n" " move %[tmp], %[new] \n"
...@@ -347,6 +350,7 @@ static inline int mips_atomic_set(struct pt_regs *regs, ...@@ -347,6 +350,7 @@ static inline int mips_atomic_set(struct pt_regs *regs,
" "STR(PTR)" 1b, 5b \n" " "STR(PTR)" 1b, 5b \n"
" "STR(PTR)" 2b, 5b \n" " "STR(PTR)" 2b, 5b \n"
" .previous \n" " .previous \n"
" .set mips0 \n"
: [old] "=&r" (old), : [old] "=&r" (old),
[err] "=&r" (err), [err] "=&r" (err),
[tmp] "=&r" (tmp) [tmp] "=&r" (tmp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment