diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2007-07-17 07:03:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:03 -0400 |
| commit | 7664732315c97f48dba9d1e7339ad16fc5a320ac (patch) | |
| tree | 1eb9639b0fbe3f24341cecf1dafcae192cb7bde7 /arch/m32r/kernel | |
| parent | bcdcd8e725b923ad7c0de809680d5d5658a7bf8c (diff) | |
PTRACE_PEEKDATA consolidation
Identical implementations of PTRACE_PEEKDATA go into generic_ptrace_peekdata()
function.
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/m32r/kernel')
| -rw-r--r-- | arch/m32r/kernel/ptrace.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c index 5f02b3144875..01a1c9ac8458 100644 --- a/arch/m32r/kernel/ptrace.c +++ b/arch/m32r/kernel/ptrace.c | |||
| @@ -595,7 +595,6 @@ void ptrace_disable(struct task_struct *child) | |||
| 595 | static int | 595 | static int |
| 596 | do_ptrace(long request, struct task_struct *child, long addr, long data) | 596 | do_ptrace(long request, struct task_struct *child, long addr, long data) |
| 597 | { | 597 | { |
| 598 | unsigned long tmp; | ||
| 599 | int ret; | 598 | int ret; |
| 600 | 599 | ||
| 601 | switch (request) { | 600 | switch (request) { |
| @@ -604,11 +603,7 @@ do_ptrace(long request, struct task_struct *child, long addr, long data) | |||
| 604 | */ | 603 | */ |
| 605 | case PTRACE_PEEKTEXT: | 604 | case PTRACE_PEEKTEXT: |
| 606 | case PTRACE_PEEKDATA: | 605 | case PTRACE_PEEKDATA: |
| 607 | ret = access_process_vm(child, addr, &tmp, sizeof(tmp), 0); | 606 | ret = generic_ptrace_peekdata(child, addr, data); |
| 608 | if (ret == sizeof(tmp)) | ||
| 609 | ret = put_user(tmp,(unsigned long __user *) data); | ||
| 610 | else | ||
| 611 | ret = -EIO; | ||
| 612 | break; | 607 | break; |
| 613 | 608 | ||
| 614 | /* | 609 | /* |
