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/m68knommu/kernel/ptrace.c | |
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/m68knommu/kernel/ptrace.c')
-rw-r--r-- | arch/m68knommu/kernel/ptrace.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c index f54b6a3dfecb..f550e614aa78 100644 --- a/arch/m68knommu/kernel/ptrace.c +++ b/arch/m68knommu/kernel/ptrace.c | |||
@@ -106,17 +106,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
106 | switch (request) { | 106 | switch (request) { |
107 | /* when I and D space are separate, these will need to be fixed. */ | 107 | /* when I and D space are separate, these will need to be fixed. */ |
108 | case PTRACE_PEEKTEXT: /* read word at location addr. */ | 108 | case PTRACE_PEEKTEXT: /* read word at location addr. */ |
109 | case PTRACE_PEEKDATA: { | 109 | case PTRACE_PEEKDATA: |
110 | unsigned long tmp; | 110 | ret = generic_ptrace_peekdata(child, addr, data); |
111 | int copied; | ||
112 | |||
113 | copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0); | ||
114 | ret = -EIO; | ||
115 | if (copied != sizeof(tmp)) | ||
116 | break; | ||
117 | ret = put_user(tmp,(unsigned long *) data); | ||
118 | break; | 111 | break; |
119 | } | ||
120 | 112 | ||
121 | /* read the word at location addr in the USER area. */ | 113 | /* read the word at location addr in the USER area. */ |
122 | case PTRACE_PEEKUSR: { | 114 | case PTRACE_PEEKUSR: { |