tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[MIPS] Fix return path of sysmips(MIPS_ATOMIC_SET, ...) The way we were doing things does no longer work on 2.6. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Ralf Baechle edcb98d1 fe3d7285

+2 -26
unified split
+1 -13
arch/mips/kernel/scall32-o32.S
··· 241 241 sw zero, PT_R7(sp) # success 242 242 sw v0, PT_R2(sp) # result 243 243 244 - /* Success, so skip usual error handling garbage. */ 245 - lw a2, TI_FLAGS($28) # syscall tracing enabled? 246 - li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT 247 - and t0, a2, t0 248 - bnez t0, 1f 249 - 250 - j o32_syscall_exit 251 - 252 - 1: SAVE_STATIC 253 - move a0, sp 254 - li a1, 1 255 - jal do_syscall_trace 256 - j syscall_exit 244 + j o32_syscall_exit # continue like a normal syscall 257 245 258 246 no_mem: li v0, -ENOMEM 259 247 jr ra
+1 -13
arch/mips/kernel/scall64-64.S
··· 174 174 sd zero, PT_R7(sp) # success 175 175 sd v0, PT_R2(sp) # result 176 176 177 - /* Success, so skip usual error handling garbage. */ 178 - li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT 179 - LONG_L a2, TI_FLAGS($28) # syscall tracing enabled? 180 - and t0, a2, t0 181 - bnez t0, 1f 182 - 183 - j n64_syscall_exit 184 - 185 - 1: SAVE_STATIC 186 - move a0, sp 187 - li a1, 1 188 - jal do_syscall_trace 189 - j syscall_exit 177 + j n64_syscall_exit # continue like a normal syscall 190 178 191 179 no_mem: li v0, -ENOMEM 192 180 jr ra