diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-05-29 03:20:44 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-05-29 03:20:44 +0000 |
| commit | 93c77ad51e4fcc28584bb93f63dd48a4a6c771ec (patch) | |
| tree | 0198ee58bab354860cf7d00f461d33143ff1aa7f /sys/miscfs/procfs | |
| parent | 171f684dab1e3ccc2da4ee86219e9396e8e38e55 (diff) | |
sched work by niklas and art backed out; causes panics
Diffstat (limited to 'sys/miscfs/procfs')
| -rw-r--r-- | sys/miscfs/procfs/procfs_ctl.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c index 7a1c92b0bb3..7f7be3b522b 100644 --- a/sys/miscfs/procfs/procfs_ctl.c +++ b/sys/miscfs/procfs/procfs_ctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: procfs_ctl.c,v 1.14 2005/05/25 23:17:47 niklas Exp $ */ +/* $OpenBSD: procfs_ctl.c,v 1.15 2005/05/29 03:20:35 deraadt Exp $ */ /* $NetBSD: procfs_ctl.c,v 1.14 1996/02/09 22:40:48 christos Exp $ */ /* @@ -48,7 +48,6 @@ #include <sys/resourcevar.h> #include <sys/signalvar.h> #include <sys/ptrace.h> -#include <sys/sched.h> #include <miscfs/procfs/procfs.h> /* @@ -111,7 +110,6 @@ procfs_control(curp, p, op) int op; { int error; - int s; /* * Attach - attaches the target process for debugging @@ -250,10 +248,8 @@ procfs_control(curp, p, op) #endif } - SCHED_LOCK(s); if (p->p_stat == SSTOP) setrunnable(p); - SCHED_UNLOCK(s); return (0); } #endif @@ -269,7 +265,6 @@ procfs_doctl(curp, p, pfs, uio) int error; char msg[PROCFS_CTLLEN+1]; const vfs_namemap_t *nm; - int s; if (uio->uio_rw != UIO_WRITE) return (EOPNOTSUPP); @@ -302,9 +297,7 @@ procfs_doctl(curp, p, pfs, uio) if (TRACE_WAIT_P(curp, p)) { p->p_xstat = nm->nm_val; FIX_SSTEP(p); - SCHED_LOCK(s); setrunnable(p); - SCHED_UNLOCK(s); } else { psignal(p, nm->nm_val); } |