diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-16 01:07:18 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-16 01:07:18 +0100 |
commit | 97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c (patch) | |
tree | a71115af6c30fdc9de0878e2cf1c51e95b17a324 /arch/mips/kernel/ptrace.c | |
parent | Input: ALPS - move v7 packet info to Documentation and v6 packet info (diff) | |
parent | Input: bfin_rotary - introduce open and close methods (diff) | |
download | linux-97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c.tar.xz linux-97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c.zip |
Merge branch 'bfin_rotary' into next
Merge bfin_rotary driver changes from Sonic Zhang.
Diffstat (limited to 'arch/mips/kernel/ptrace.c')
-rw-r--r-- | arch/mips/kernel/ptrace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index 9d1487d83293..510452812594 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -770,6 +770,8 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall) long ret = 0; user_exit(); + current_thread_info()->syscall = syscall; + if (secure_computing() == -1) return -1; |