Skip to content

L
linux
Commit 2e815fb5 authored by Richard Henderson's avatar Richard Henderson
Browse files
Options

Merge kanga.twiddle.net:/home/rth/work/linux/linus-2.5 

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5
parents ace40f57 52c0adae
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
arch/alpha/kernel/ptrace.c
View file @ 2e815fb5
...@@ -366,8 +366,8 @@ do_sys_ptrace(long request, long pid, long addr, long data, ...@@ -366,8 +366,8 @@ do_sys_ptrace(long request, long pid, long addr, long data,
ret = -EIO; ret = -EIO;
if ((unsigned long) data > _NSIG) if ((unsigned long) data > _NSIG)
break; break;
/* Mark single stepping. */ /* Set single stepping. */
child->thread_info->bpt_nsaved = -1; ptrace_set_bpt(child);
clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
wake_up_process(child); wake_up_process(child);
child->exit_code = data; child->exit_code = data;
...@@ -397,11 +397,11 @@ syscall_trace(void) ...@@ -397,11 +397,11 @@ syscall_trace(void)
return; return;
if (!(current->ptrace & PT_PTRACED)) if (!(current->ptrace & PT_PTRACED))
return; return;
current->exit_code = SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) /* The 0x80 provides a way for the tracing parent to distinguish
? 0x80 : 0); between a syscall stop and SIGTRAP delivery */
current->state = TASK_STOPPED; ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
notify_parent(current, SIGCHLD); ? 0x80 : 0));
schedule();
/* /*
* This isn't the same as continuing with a signal, but it will do * This isn't the same as continuing with a signal, but it will do
* for normal use. strace only continues with a signal if the * for normal use. strace only continues with a signal if the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7