diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-02-19 10:00:34 -0500 |
| commit | 661af35e5fd878f915ed05dbbfe383f64133f98c (patch) | |
| tree | 956b7efd662b682224e61060552fdcf4201101bf /arch/mips/kernel/syscall.c | |
| parent | ca5d25642e212f73492d332d95dc90ef46a0e8dc (diff) | |
| parent | f296e7c48d3155991b99f41372e1786c5be03457 (diff) | |
Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/syscall.c')
| -rw-r--r-- | arch/mips/kernel/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 604b558809c4..53a7ef9a8f32 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c | |||
| @@ -136,7 +136,7 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) | |||
| 136 | : "memory"); | 136 | : "memory"); |
| 137 | } else if (cpu_has_llsc) { | 137 | } else if (cpu_has_llsc) { |
| 138 | __asm__ __volatile__ ( | 138 | __asm__ __volatile__ ( |
| 139 | " .set arch=r4000 \n" | 139 | " .set "MIPS_ISA_ARCH_LEVEL" \n" |
| 140 | " li %[err], 0 \n" | 140 | " li %[err], 0 \n" |
| 141 | "1: ll %[old], (%[addr]) \n" | 141 | "1: ll %[old], (%[addr]) \n" |
| 142 | " move %[tmp], %[new] \n" | 142 | " move %[tmp], %[new] \n" |