From 31932f066a1ecde08ccb855d67ff572dabed9e53 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 28 Jan 2006 22:17:11 -0500 Subject: [PATCH] --- yaml --- r: 20035 b: refs/heads/master c: c350885854c231810c06aa166b46eab039e80d97 h: refs/heads/master i: 20033: cc98c90095ace1e7f11ccbf4f6cb49761a8c94f2 20031: d3caf043652d34719e42bbfea9ba4011548a2ecf v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/kernel/ptrace.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b851307e97a4..8975cf12c343 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7be7cbf684b372abaa8d6723eabedfa6ad79ee43 +refs/heads/master: c350885854c231810c06aa166b46eab039e80d97 diff --git a/trunk/arch/cris/arch-v10/kernel/ptrace.c b/trunk/arch/cris/arch-v10/kernel/ptrace.c index f214f74f264e..961c0d58ded4 100644 --- a/trunk/arch/cris/arch-v10/kernel/ptrace.c +++ b/trunk/arch/cris/arch-v10/kernel/ptrace.c @@ -202,18 +202,18 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) int i; unsigned long tmp; + ret = 0; for (i = 0; i <= PT_MAX; i++) { tmp = get_reg(child, i); if (put_user(tmp, datap)) { ret = -EFAULT; - goto out_tsk; + break; } data += sizeof(long); } - ret = 0; break; } @@ -222,10 +222,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) int i; unsigned long tmp; + ret = 0; for (i = 0; i <= PT_MAX; i++) { if (get_user(tmp, datap)) { ret = -EFAULT; - goto out_tsk; + break; } if (i == PT_DCCR) { @@ -237,7 +238,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) data += sizeof(long); } - ret = 0; break; }