From f48f3c8c34b1e586d0ad204144609124300afcbc Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Fri, 7 Sep 2012 18:20:30 +0100 Subject: [PATCH] --- yaml --- r: 331501 b: refs/heads/master c: ebb5e15c3eb942c047108063423d5d6a04b9f167 h: refs/heads/master i: 331499: 8cd9b911423e927d7aea22e5a58771d43b86295b v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/ptrace.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index be7428c559df..063e7d042ea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f66e06fb6414732bef7bf4a071ef76a837badec +refs/heads/master: ebb5e15c3eb942c047108063423d5d6a04b9f167 diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c index c382d3c76ac6..739db3a1b2d2 100644 --- a/trunk/arch/arm/kernel/ptrace.c +++ b/trunk/arch/arm/kernel/ptrace.c @@ -944,19 +944,19 @@ static int ptrace_syscall_trace(struct pt_regs *regs, int scno, asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno) { - int ret = ptrace_syscall_trace(regs, scno, PTRACE_SYSCALL_ENTER); + scno = ptrace_syscall_trace(regs, scno, PTRACE_SYSCALL_ENTER); if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) - trace_sys_enter(regs, ret); + trace_sys_enter(regs, scno); audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0, regs->ARM_r1, regs->ARM_r2, regs->ARM_r3); - return ret; + return scno; } asmlinkage int syscall_trace_exit(struct pt_regs *regs, int scno) { - int ret = ptrace_syscall_trace(regs, scno, PTRACE_SYSCALL_EXIT); + scno = ptrace_syscall_trace(regs, scno, PTRACE_SYSCALL_EXIT); if (test_thread_flag(TIF_SYSCALL_TRACEPOINT)) - trace_sys_exit(regs, ret); + trace_sys_exit(regs, scno); audit_syscall_exit(regs); - return ret; + return scno; }