diff options
author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
commit | e55574f93ecb78dac5a15f29d18f2ab4dbc813bc (patch) | |
tree | ffce30ba6d6a11b3fdc5ebd28e5f3cca2d87d12c /arch/mips/kernel/scall32-o32.S | |
parent | 9ea00e4fa07ce46ab79c92087c72ae100de4de42 (diff) | |
parent | d831fd1b46d04e5c8c8a0431c321578d25852695 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-14.09
Diffstat (limited to 'arch/mips/kernel/scall32-o32.S')
-rw-r--r-- | arch/mips/kernel/scall32-o32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 9b36424b03c5..ed5bafb5d637 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S @@ -52,7 +52,7 @@ NESTED(handle_sys, PT_SIZE, sp) stack_done: lw t0, TI_FLAGS($28) # syscall tracing enabled? - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT + li t1, _TIF_WORK_SYSCALL_ENTRY and t0, t1 bnez t0, syscall_trace_entry # -> yes |