A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

ptrace: use ptrace_request() in the remaining architectures

Browse source 
Use ptrace_request() in the three remaining architectures that didn't use it
(m68knommu, h8300, microblaze).  This means:

 - ptrace_request now handles PTRACE_{PEEK,POKE}{TEXT,DATA} and PTRACE_DETATCH
   calls that were previously called directly, or in case of h8300 even open
   coded.
 - adds new support for PTRACE_SETOPTIONS/PTRACE_GETEVENTMSG/
   PTRACE_GETSIGINFO/PTRACE_SETSIGINFO

Signed-off-by: Christoph Hellwig <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Michal Simek <[email protected]>
Acked-by: Greg Ungerer <[email protected]>
Acked-by: Roland McGrath <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Christoph Hellwig 2010-03-10 15:22:44 -08:00 • committed by Linus Torvalds
commit b3c1e01a09
3 changed files with 3 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

30
arch/h8300/kernel/ptrace.c
View file

@ -42,14 +42,6 @@ extern void h8300_enable_trace(struct task_struct *child);
* in exit.c or in signal.c.
*/
inline
static int read_long(struct task_struct * tsk, unsigned long addr,
unsigned long * result)
{
*result = *(unsigned long *)addr;
return 0;
}
void ptrace_disable(struct task_struct *child)
{
h8300_disable_trace(child);
@ -60,17 +52,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
int ret;
switch (request) {
case PTRACE_PEEKTEXT: /* read word at location addr. */
case PTRACE_PEEKDATA: {
unsigned long tmp;
ret = read_long(child, addr, &tmp);
if (ret < 0)
break ;
ret = put_user(tmp, (unsigned long *) data);
break ;
}
/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
unsigned long tmp = 0;
@ -109,11 +90,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
}
/* when I and D space are separate, this will have to be fixed. */
case PTRACE_POKETEXT: /* write the word at location addr. */
case PTRACE_POKEDATA:
ret = generic_ptrace_pokedata(child, addr, data);
break;
case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
if ((addr & 3) || addr < 0 || addr >= sizeof(struct user)) {
ret = -EIO;
@ -175,10 +151,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
break;
}
case PTRACE_DETACH: /* detach a process that was attached. */
ret = ptrace_detach(child, data);
break;
case PTRACE_GETREGS: { /* Get all gp regs from the child. */
int i;
unsigned long tmp;
@ -210,7 +182,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
}
default:
ret = -EIO;
ret = ptrace_request(child, request, addr, data);
break;
}
return ret;