xnu-517.7.7.tar.gz

[apple/xnu.git] / bsd / kern / subr_log.c

diff --git a/bsd/kern/subr_log.c b/bsd/kern/subr_log.c
index 792975a0f90025b2a4a3e7c9ca05398ef7be40aa..2bab82bac83746347809a4ebed9157c2859ed8b8 100644 (file)
--- a/bsd/kern/subr_log.c
+++ b/bsd/kern/subr_log.c
@@ -69,10 +69,6 @@
 #include <sys/errno.h>
 #include <sys/select.h>
 #include <kern/thread.h>
-#if 0 /* [ */
-#include <kern/sched_prim.h>
-#include <kern/parallel.h>
-#endif  /* 0 ] */
 
 #define LOG_RDPRI      (PZERO + 1)
 
@@ -107,11 +103,9 @@ logopen(dev, flags, mode, p)
        int flags, mode;
        struct proc *p;
 {
-       unix_master();                  /* for pg_id, sigh */
        LOG_LOCK();
        if (log_open) {
                LOG_UNLOCK();
-               unix_release();
                return (EBUSY);
        }
        log_open = 1;
@@ -130,7 +124,7 @@ logopen(dev, flags, mode, p)
                        msgbufp->msg_bufc[i] = 0;
        }
        LOG_UNLOCK();
-       unix_release();
+
        return (0);
 }
 
@@ -201,9 +195,10 @@ logread(dev, uio, flag)
 
 /*ARGSUSED*/
 int
-logselect(dev, rw, p)
+logselect(dev, rw, wql, p)
        dev_t dev;
        int rw;
+       void * wql;
        struct proc *p;
 {
        int s = splhigh();
@@ -215,7 +210,7 @@ logselect(dev, rw, p)
                        splx(s);
                        return (1);
                }
-               selrecord(p, &logsoftc.sc_selp);
+               selrecord(p, &logsoftc.sc_selp, wql);
                break;
        }
        splx(s);
@@ -234,7 +229,6 @@ logwakeup()
        funnel_state = thread_funnel_set(kernel_flock, TRUE);
        selwakeup(&logsoftc.sc_selp);
        if (logsoftc.sc_state & LOG_ASYNC) {
-               unix_master();
                LOG_LOCK();
                pgid = logsoftc.sc_pgid;
                LOG_UNLOCK();
@@ -242,7 +236,6 @@ logwakeup()
                        gsignal(-pgid, SIGIO); 
                else if (p = pfind(pgid))
                        psignal(p, SIGIO);
-               unix_release();
        }
        if (logsoftc.sc_state & LOG_RDWAIT) {
                wakeup((caddr_t)msgbufp);
@@ -263,7 +256,7 @@ klogwakeup()
 
 /*ARGSUSED*/
 int
-logioctl(com, data, flag)
+logioctl(dev, com, data, flag)
        caddr_t data;
 {
        long l;