Blackfin arch: use existing ptrace_disable() func to clear TRACE_BITS and create the opposite ptrace_enable()

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Mike Frysinger 2008-10-09 15:21:05 +08:00 committed by Bryan Wu
parent d3ab3a62f5
commit cb4c173d94
1 changed files with 37 additions and 50 deletions

View File

@ -175,6 +175,13 @@ static inline int is_user_addr_valid(struct task_struct *child,
return -EIO; return -EIO;
} }
void ptrace_enable(struct task_struct *child)
{
unsigned long tmp;
tmp = get_reg(child, PT_SYSCFG) | (TRACE_BITS);
put_reg(child, PT_SYSCFG, tmp);
}
/* /*
* Called by kernel/ptrace.c when detaching.. * Called by kernel/ptrace.c when detaching..
* *
@ -347,29 +354,22 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
break; break;
case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
case PTRACE_CONT: case PTRACE_CONT: /* restart after signal. */
{ /* restart after signal. */ pr_debug("ptrace: syscall/cont\n");
long tmp;
pr_debug("ptrace: syscall/cont\n"); ret = -EIO;
if (!valid_signal(data))
ret = -EIO;
if (!valid_signal(data))
break;
if (request == PTRACE_SYSCALL)
set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
else
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
child->exit_code = data;
/* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SYSCFG) & ~(TRACE_BITS);
put_reg(child, PT_SYSCFG, tmp);
pr_debug("ptrace: before wake_up_process\n");
wake_up_process(child);
ret = 0;
break; break;
} if (request == PTRACE_SYSCALL)
set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
else
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
child->exit_code = data;
ptrace_disable(child);
pr_debug("ptrace: before wake_up_process\n");
wake_up_process(child);
ret = 0;
break;
/* /*
* make the child exit. Best I can do is send it a sigkill. * make the child exit. Best I can do is send it a sigkill.
@ -377,38 +377,25 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
* exit. * exit.
*/ */
case PTRACE_KILL: case PTRACE_KILL:
{ ret = 0;
long tmp; if (child->exit_state == EXIT_ZOMBIE) /* already dead */
ret = 0;
if (child->exit_state == EXIT_ZOMBIE) /* already dead */
break;
child->exit_code = SIGKILL;
/* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SYSCFG) & ~(TRACE_BITS);
put_reg(child, PT_SYSCFG, tmp);
wake_up_process(child);
break; break;
} child->exit_code = SIGKILL;
ptrace_disable(child);
wake_up_process(child);
break;
case PTRACE_SINGLESTEP: case PTRACE_SINGLESTEP: /* set the trap flag. */
{ /* set the trap flag. */ pr_debug("ptrace: single step\n");
long tmp; ret = -EIO;
if (!valid_signal(data))
pr_debug("ptrace: single step\n");
ret = -EIO;
if (!valid_signal(data))
break;
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
tmp = get_reg(child, PT_SYSCFG) | (TRACE_BITS);
put_reg(child, PT_SYSCFG, tmp);
child->exit_code = data;
/* give it a chance to run. */
wake_up_process(child);
ret = 0;
break; break;
} clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
ptrace_enable(child);
child->exit_code = data;
wake_up_process(child);
ret = 0;
break;
case PTRACE_GETREGS: case PTRACE_GETREGS:
/* Get all gp regs from the child. */ /* Get all gp regs from the child. */