diff options
| author | kib <kib@FreeBSD.org> | 2012-02-11 14:49:25 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2012-02-11 14:49:25 +0000 |
| commit | 4658c8a871895ad35616e374872586507064af81 (patch) | |
| tree | 10ca7a98f506d79e7ce0d2afb5f2b6516aac7df0 | |
| parent | 38bf0509a452ec918d5b5c9c887b4f3a213ecc19 (diff) | |
| download | FreeBSD-src-4658c8a871895ad35616e374872586507064af81.zip FreeBSD-src-4658c8a871895ad35616e374872586507064af81.tar.gz | |
The PTRACESTOP() macro is used only once. Inline the only use and remove
the macro.
MFC after: 1 week
| -rw-r--r-- | sys/kern/subr_syscall.c | 6 | ||||
| -rw-r--r-- | sys/sys/ptrace.h | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index 75328f6..9c4dd48 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -85,7 +85,11 @@ syscallenter(struct thread *td, struct syscall_args *sa) if (error == 0) { STOPEVENT(p, S_SCE, sa->narg); - PTRACESTOP_SC(p, td, S_PT_SCE); + if (p->p_flag & P_TRACED && p->p_stops & S_PT_SCE) { + PROC_LOCK(p); + ptracestop((td), SIGTRAP); + PROC_UNLOCK(p); + } if (td->td_dbgflags & TDB_USERWR) { /* * Reread syscall number and arguments if diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index 8a02495..e770a06 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -131,12 +131,6 @@ struct ptrace_vm_entry { #ifdef _KERNEL -#define PTRACESTOP_SC(p, td, flag) \ - if ((p)->p_flag & P_TRACED && (p)->p_stops & (flag)) { \ - PROC_LOCK(p); \ - ptracestop((td), SIGTRAP); \ - PROC_UNLOCK(p); \ - } /* * The flags below are used for ptrace(2) tracing and have no relation * to procfs. They are stored in struct proc's p_stops member. |
