select subsystem si_pid becomes si_selpid, to not conflict against user/kernel siginf...

diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c
index 3e4044d..c7efe29 100644 (file)
--- a/sys/arch/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pcvt_drv.c,v 1.14 1996/06/10 07:35:40 deraadt Exp $   */
+/*     $OpenBSD: pcvt_drv.c,v 1.15 1997/01/27 23:20:59 deraadt Exp $   */
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -970,7 +970,7 @@ pcstart(register struct tty *tp)
                goto out;
 
        if (tp->t_outq.c_cc == 0 &&
-           tp->t_wsel.si_pid == 0)
+           tp->t_wsel.si_selpid == 0)
        {
                async_update();
                goto low;

diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index e89935f..68953ba 100644 (file)
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sys_generic.c,v 1.6 1996/10/12 01:15:44 deraadt Exp $ */
+/*     $OpenBSD: sys_generic.c,v 1.7 1997/01/27 23:21:13 deraadt Exp $ */
 /*     $NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $     */
 
 /*
@@ -720,13 +720,13 @@ selrecord(selector, sip)
        pid_t mypid;
 
        mypid = selector->p_pid;
-       if (sip->si_pid == mypid)
+       if (sip->si_selpid == mypid)
                return;
-       if (sip->si_pid && (p = pfind(sip->si_pid)) &&
+       if (sip->si_selpid && (p = pfind(sip->si_selpid)) &&
            p->p_wchan == (caddr_t)&selwait)
                sip->si_flags |= SI_COLL;
        else
-               sip->si_pid = mypid;
+               sip->si_selpid = mypid;
 }
 
 /*
@@ -739,15 +739,15 @@ selwakeup(sip)
        register struct proc *p;
        int s;
 
-       if (sip->si_pid == 0)
+       if (sip->si_selpid == 0)
                return;
        if (sip->si_flags & SI_COLL) {
                nselcoll++;
                sip->si_flags &= ~SI_COLL;
                wakeup((caddr_t)&selwait);
        }
-       p = pfind(sip->si_pid);
-       sip->si_pid = 0;
+       p = pfind(sip->si_selpid);
+       sip->si_selpid = 0;
        if (p != NULL) {
                s = splhigh();
                if (p->p_wchan == (caddr_t)&selwait) {

diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 2f0079a..083f20b 100644 (file)
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bpf.c,v 1.6 1996/12/07 09:17:46 deraadt Exp $ */
+/*     $OpenBSD: bpf.c,v 1.7 1997/01/27 23:21:18 deraadt Exp $ */
 /*     $NetBSD: bpf.c,v 1.27 1996/05/07 05:26:02 thorpej Exp $ */
 
 /*
@@ -532,7 +532,7 @@ bpf_wakeup(d)
 #if BSD >= 199103
        selwakeup(&d->bd_sel);
        /* XXX */
-       d->bd_sel.si_pid = 0;
+       d->bd_sel.si_selpid = 0;
 #else
        if (d->bd_selproc) {
                selwakeup(d->bd_selproc, (int)d->bd_selcoll);

diff --git a/sys/sys/select.h b/sys/sys/select.h
index a52dc0a..28be228 100644 (file)
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: select.h,v 1.2 1996/03/03 12:12:16 niklas Exp $       */
+/*     $OpenBSD: select.h,v 1.3 1997/01/27 23:21:21 deraadt Exp $      */
 /*     $NetBSD: select.h,v 1.10 1995/03/26 20:24:38 jtc Exp $  */
 
 /*-
@@ -44,7 +44,7 @@
  * notified when I/O becomes possible.
  */
 struct selinfo {
-       pid_t   si_pid;         /* process to be notified */
+       pid_t   si_selpid;      /* process to be notified */
        short   si_flags;       /* see below */
 };
 #define        SI_COLL 0x0001          /* collision occurred */

diff --git a/sys/sys/siginfo.h b/sys/sys/siginfo.h
index c7d4896..0cae60c 100644 (file)
--- a/sys/sys/siginfo.h
+++ b/sys/sys/siginfo.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: siginfo.h,v 1.2 1997/01/27 03:18:09 deraadt Exp $     */
+/*     $OpenBSD: siginfo.h,v 1.3 1997/01/27 23:21:22 deraadt Exp $     */
 
 /*
  * Copyright (c) 1997 Theo de Raadt
@@ -184,8 +184,7 @@ typedef struct {
        } _data;
 } siginfo_t;
 
-/* collides with select inside the kernel */
-#define si_pid_XXX     _data._proc._pid
+#define si_pid         _data._proc._pid
 
 #define si_status      _data._proc._pdata._cld._status
 #define si_stime       _data._proc._pdata._cld._stime