aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2007-07-17 07:03:44 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:03 -0400
commitf284ce7269031947326bac6bb19a977705276222 (patch)
tree8b145d42d4da182fb185dacc53b24ca7a2546114 /arch/i386
parent7664732315c97f48dba9d1e7339ad16fc5a320ac (diff)
PTRACE_POKEDATA consolidation
Identical implementations of PTRACE_POKEDATA go into generic_ptrace_pokedata() function. AFAICS, fix bug on xtensa where successful PTRACE_POKEDATA will nevertheless return EPERM. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Christoph Hellwig <hch@lst.de> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/ptrace.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index f4bcf1da662a..1c075f58d1f9 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -387,10 +387,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
387 /* when I and D space are separate, this will have to be fixed. */ 387 /* when I and D space are separate, this will have to be fixed. */
388 case PTRACE_POKETEXT: /* write the word at location addr. */ 388 case PTRACE_POKETEXT: /* write the word at location addr. */
389 case PTRACE_POKEDATA: 389 case PTRACE_POKEDATA:
390 ret = 0; 390 ret = generic_ptrace_pokedata(child, addr, data);
391 if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
392 break;
393 ret = -EIO;
394 break; 391 break;
395 392
396 case PTRACE_POKEUSR: /* write the word at location addr in the USER area */ 393 case PTRACE_POKEUSR: /* write the word at location addr in the USER area */