diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 46416d9e8922..a2c766340227 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.168 2002/11/08 05:02:07 kent Exp $	*/
+/*	$NetBSD: audio.c,v 1.169 2002/11/26 18:49:40 christos Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.168 2002/11/08 05:02:07 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.169 2002/11/26 18:49:40 christos Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -1983,7 +1983,7 @@ filt_audiordetach(struct knote *kn)
 	int s;
 
 	s = splaudio();
-	SLIST_REMOVE(&sc->sc_rsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -2015,7 +2015,7 @@ filt_audiowdetach(struct knote *kn)
 	int s;
 
 	s = splaudio();
-	SLIST_REMOVE(&sc->sc_wsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_wsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -2045,12 +2045,12 @@ audio_kqfilter(struct audio_softc *sc, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_rsel.si_klist;
+		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &audioread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &sc->sc_wsel.si_klist;
+		klist = &sc->sc_wsel.sel_klist;
 		kn->kn_fop = &audiowrite_filtops;
 		break;
 
diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c
index 259fb8a231b3..8011a71765a1 100644
--- a/sys/dev/ir/irframe_tty.c
+++ b/sys/dev/ir/irframe_tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: irframe_tty.c,v 1.22 2002/10/23 09:13:21 jdolecek Exp $	*/
+/*	$NetBSD: irframe_tty.c,v 1.23 2002/11/26 18:49:42 christos Exp $	*/
 
 /*
  * TODO
@@ -672,7 +672,7 @@ filt_irframetrdetach(struct knote *kn)
 	int s;
 
 	s = splir();
-	SLIST_REMOVE(&sc->sc_rsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -694,7 +694,7 @@ filt_irframetwdetach(struct knote *kn)
 	int s;
 
 	s = splir();
-	SLIST_REMOVE(&sc->sc_wsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_wsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -729,11 +729,11 @@ irframet_kqfilter(void *h, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_rsel.si_klist;
+		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &irframetread_filtops;
 		break;
 	case EVFILT_WRITE:
-		klist = &sc->sc_wsel.si_klist;
+		klist = &sc->sc_wsel.sel_klist;
 		kn->kn_fop = &irframetwrite_filtops;
 		break;
 	default:
diff --git a/sys/dev/isa/satlink.c b/sys/dev/isa/satlink.c
index 1a7e8f7260c6..7044075c0936 100644
--- a/sys/dev/isa/satlink.c
+++ b/sys/dev/isa/satlink.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: satlink.c,v 1.20 2002/10/23 09:13:24 jdolecek Exp $	*/
+/*	$NetBSD: satlink.c,v 1.21 2002/11/26 18:49:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.20 2002/10/23 09:13:24 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.21 2002/11/26 18:49:43 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -434,7 +434,7 @@ filt_satlinkrdetach(struct knote *kn)
 	int s;
 
 	s = splsoftclock();
-	SLIST_REMOVE(&sc->sc_selq.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_selq.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -469,12 +469,12 @@ satlinkkqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_selq.si_klist;
+		klist = &sc->sc_selq.sel_klist;
 		kn->kn_fop = &satlinkread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &sc->sc_selq.si_klist;
+		klist = &sc->sc_selq.sel_klist;
 		kn->kn_fop = &satlink_seltrue_filtops;
 		break;
 
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index d8a78f3378ba..31053efe9846 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: midi.c,v 1.30 2002/10/23 09:13:03 jdolecek Exp $	*/
+/*	$NetBSD: midi.c,v 1.31 2002/11/26 18:49:41 christos Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.30 2002/10/23 09:13:03 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.31 2002/11/26 18:49:41 christos Exp $");
 
 #include "midi.h"
 #include "sequencer.h"
@@ -777,7 +777,7 @@ filt_midirdetach(struct knote *kn)
 	int s;
 
 	s = splaudio();
-	SLIST_REMOVE(&sc->rsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->rsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -802,7 +802,7 @@ filt_midiwdetach(struct knote *kn)
 	int s;
 
 	s = splaudio();
-	SLIST_REMOVE(&sc->wsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->wsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -830,12 +830,12 @@ midikqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->rsel.si_klist;
+		klist = &sc->rsel.sel_klist;
 		kn->kn_fop = &midiread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &sc->wsel.si_klist;
+		klist = &sc->wsel.sel_klist;
 		kn->kn_fop = &midiwrite_filtops;
 		break;
 
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index 81586b00f3b7..43d4e1c942c9 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bktr_core.c,v 1.22 2002/08/28 06:06:10 toshii Exp $	*/
+/*	$NetBSD: bktr_core.c,v 1.23 2002/11/26 18:49:44 christos Exp $	*/
 
 /* FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp */
 
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.22 2002/08/28 06:06:10 toshii Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.23 2002/11/26 18:49:44 christos Exp $");
 
 #include "opt_bktr.h"		/* Include any kernel config options */
 
@@ -812,7 +812,7 @@ common_bktr_intr( void *arg )
 		}
 
 		/* If someone has a select() on /dev/vbi, inform them */
-		if (bktr->vbi_select.si_pid) {
+		if (bktr->vbi_select.sel_pid) {
 			selwakeup(&bktr->vbi_select);
 		}
 
diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c
index a32c97464474..f40555aa54df 100644
--- a/sys/dev/pci/oboe.c
+++ b/sys/dev/pci/oboe.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: oboe.c,v 1.10 2002/11/26 03:25:51 fvdl Exp $	*/
+/*	$NetBSD: oboe.c,v 1.11 2002/11/26 18:49:44 christos Exp $	*/
 
 /*	XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage	*/
 
@@ -489,7 +489,7 @@ filt_oboerdetach(struct knote *kn)
 	int s;
 
 	s = splir();
-	SLIST_REMOVE(&sc->sc_rsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -509,7 +509,7 @@ filt_oboewdetach(struct knote *kn)
 	int s;
 
 	s = splir();
-	SLIST_REMOVE(&sc->sc_wsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_wsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -527,11 +527,11 @@ oboe_kqfilter(void *h, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_rsel.si_klist;
+		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &oboeread_filtops;
 		break;
 	case EVFILT_WRITE:
-		klist = &sc->sc_wsel.si_klist;
+		klist = &sc->sc_wsel.sel_klist;
 		kn->kn_fop = &oboewrite_filtops;
 		break;
 	default:
diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c
index 10550bb91eb0..fe40b37f2543 100644
--- a/sys/dev/qbus/qd.c
+++ b/sys/dev/qbus/qd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: qd.c,v 1.29 2002/10/23 09:13:36 jdolecek Exp $	*/
+/*	$NetBSD: qd.c,v 1.30 2002/11/26 18:49:45 christos Exp $	*/
 
 /*-
  * Copyright (c) 1988 Regents of the University of California.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.29 2002/10/23 09:13:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.30 2002/11/26 18:49:45 christos Exp $");
 
 #include "opt_ddb.h"
 
@@ -1565,7 +1565,7 @@ filt_qdrdetach(struct knote *kn)
 	int s;
 
 	s = spl5();
-	SLIST_REMOVE(&qdrsel[unit].si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&qdrsel[unit].sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -1617,12 +1617,12 @@ qdkqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &qdrsel[unit].si_klist;
+		klist = &qdrsel[unit].sel_klist;
 		kn->kn_fop = &qdread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &qdrsel[unit].si_klist;
+		klist = &qdrsel[unit].sel_klist;
 		kn->kn_fop = &qdwrite_filtops;
 		break;
 
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index 4495a8579e58..e3c6594a0145 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rnd.c,v 1.37 2002/11/10 03:29:00 thorpej Exp $	*/
+/*	$NetBSD: rnd.c,v 1.38 2002/11/26 18:49:41 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.37 2002/11/10 03:29:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.38 2002/11/26 18:49:41 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -713,7 +713,7 @@ filt_rnddetach(struct knote *kn)
 	int s;
 
 	s = splsoftclock();
-	SLIST_REMOVE(&rnd_selq.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&rnd_selq.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -744,7 +744,7 @@ rndkqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &rnd_selq.si_klist;
+		klist = &rnd_selq.sel_klist;
 		if (minor(dev) == RND_DEV_URANDOM)
 			kn->kn_fop = &rnd_seltrue_filtops;
 		else
@@ -752,7 +752,7 @@ rndkqfilter(dev_t dev, struct knote *kn)
 		break;
 
 	case EVFILT_WRITE:
-		klist = &rnd_selq.si_klist;
+		klist = &rnd_selq.sel_klist;
 		kn->kn_fop = &rnd_seltrue_filtops;
 		break;
 
diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c
index 1db2089b2e16..a6a94a48879a 100644
--- a/sys/dev/sbus/bpp.c
+++ b/sys/dev/sbus/bpp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bpp.c,v 1.17 2002/10/23 09:13:42 jdolecek Exp $ */
+/*	$NetBSD: bpp.c,v 1.18 2002/11/26 18:49:46 christos Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.17 2002/10/23 09:13:42 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.18 2002/11/26 18:49:46 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -511,7 +511,7 @@ filt_bpprdetach(struct knote *kn)
 	int s;
 
 	s = splbpp();
-	SLIST_REMOVE(&sc->sc_rsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -532,7 +532,7 @@ filt_bppwdetach(struct knote *kn)
 	int s;
 
 	s = splbpp();
-	SLIST_REMOVE(&sc->sc_wsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_wsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -560,12 +560,12 @@ bppkqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_rsel.si_klist;
+		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &bppread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &sc->sc_wsel.si_klist;
+		klist = &sc->sc_wsel.sel_klist;
 		kn->kn_fop = &bppwrite_filtops;
 		break;
 
diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c
index d10dcb6eb955..ce42ba22d30e 100644
--- a/sys/dev/scsipi/ch.c
+++ b/sys/dev/scsipi/ch.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ch.c,v 1.54 2002/10/23 09:13:46 jdolecek Exp $	*/
+/*	$NetBSD: ch.c,v 1.55 2002/11/26 18:49:47 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.54 2002/10/23 09:13:46 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.55 2002/11/26 18:49:47 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -485,7 +485,7 @@ filt_chdetach(struct knote *kn)
 {
 	struct ch_softc *sc = kn->kn_hook;
 
-	SLIST_REMOVE(&sc->sc_selq.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_selq.sel_klist, kn, knote, kn_selnext);
 }
 
 static int
@@ -513,12 +513,12 @@ chkqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_selq.si_klist;
+		klist = &sc->sc_selq.sel_klist;
 		kn->kn_fop = &chread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &sc->sc_selq.si_klist;
+		klist = &sc->sc_selq.sel_klist;
 		kn->kn_fop = &chwrite_filtops;
 		break;
 
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index af6a41ee0235..57eb8a52c46d 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sequencer.c,v 1.21 2002/10/23 09:13:05 jdolecek Exp $	*/
+/*	$NetBSD: sequencer.c,v 1.22 2002/11/26 18:49:41 christos Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.21 2002/10/23 09:13:05 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.22 2002/11/26 18:49:41 christos Exp $");
 
 #include "sequencer.h"
 
@@ -681,7 +681,7 @@ filt_sequencerrdetach(struct knote *kn)
 	int s;
 
 	s = splaudio();
-	SLIST_REMOVE(&sc->rsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->rsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -708,7 +708,7 @@ filt_sequencerwdetach(struct knote *kn)
 	int s;
 
 	s = splaudio();
-	SLIST_REMOVE(&sc->wsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->wsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -737,12 +737,12 @@ sequencerkqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->rsel.si_klist;
+		klist = &sc->rsel.sel_klist;
 		kn->kn_fop = &sequencerread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &sc->wsel.si_klist;
+		klist = &sc->wsel.sel_klist;
 		kn->kn_fop = &sequencerwrite_filtops;
 		break;
 
diff --git a/sys/dev/sun/event.c b/sys/dev/sun/event.c
index 09448e73704c..a81d4b372989 100644
--- a/sys/dev/sun/event.c
+++ b/sys/dev/sun/event.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: event.c,v 1.11 2002/10/23 09:13:54 jdolecek Exp $	*/
+/*	$NetBSD: event.c,v 1.12 2002/11/26 18:49:48 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.11 2002/10/23 09:13:54 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.12 2002/11/26 18:49:48 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
@@ -183,7 +183,7 @@ filt_evrdetach(struct knote *kn)
 	int s;
 
 	s = splev();
-	SLIST_REMOVE(&ev->ev_sel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&ev->ev_sel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -217,7 +217,7 @@ ev_kqfilter(struct evvar *ev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &ev->ev_sel.si_klist;
+		klist = &ev->ev_sel.sel_klist;
 		kn->kn_fop = &ev_filtops;
 		break;
 
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 8e5a21df76a2..68ea2eb2cce7 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ugen.c,v 1.62 2002/10/23 09:13:59 jdolecek Exp $	*/
+/*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.62 2002/10/23 09:13:59 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1364,7 +1364,7 @@ filt_ugenrdetach(struct knote *kn)
 	int s;
 
 	s = splusb();
-	SLIST_REMOVE(&sce->rsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sce->rsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -1423,7 +1423,7 @@ ugenkqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sce->rsel.si_klist;
+		klist = &sce->rsel.sel_klist;
 		switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
 		case UE_INTERRUPT:
 			kn->kn_fop = &ugenread_intr_filtops;
@@ -1445,7 +1445,7 @@ ugenkqfilter(dev_t dev, struct knote *kn)
 		break;
 
 	case EVFILT_WRITE:
-		klist = &sce->rsel.si_klist;
+		klist = &sce->rsel.sel_klist;
 		switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
 		case UE_INTERRUPT:
 		case UE_ISOCHRONOUS:
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 598370440823..74c3f776f358 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhid.c,v 1.55 2002/10/23 09:14:00 jdolecek Exp $	*/
+/*	$NetBSD: uhid.c,v 1.56 2002/11/26 18:49:49 christos Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.55 2002/10/23 09:14:00 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.56 2002/11/26 18:49:49 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -573,7 +573,7 @@ filt_uhidrdetach(struct knote *kn)
 	int s;
 
 	s = splusb();
-	SLIST_REMOVE(&sc->sc_rsel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -606,12 +606,12 @@ uhidkqfilter(dev_t dev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_rsel.si_klist;
+		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &uhidread_filtops;
 		break;
 
 	case EVFILT_WRITE:
-		klist = &sc->sc_rsel.si_klist;
+		klist = &sc->sc_rsel.sel_klist;
 		kn->kn_fop = &uhid_seltrue_filtops;
 		break;
 
diff --git a/sys/dev/usb/uirda.c b/sys/dev/usb/uirda.c
index 047676255ecd..2af7428744c5 100644
--- a/sys/dev/usb/uirda.c
+++ b/sys/dev/usb/uirda.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uirda.c,v 1.13 2002/10/23 09:14:01 jdolecek Exp $	*/
+/*	$NetBSD: uirda.c,v 1.14 2002/11/26 18:49:49 christos Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.13 2002/10/23 09:14:01 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.14 2002/11/26 18:49:49 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -689,7 +689,7 @@ filt_uirdardetach(struct knote *kn)
 	int s;
 
 	s = splusb();
-	SLIST_REMOVE(&sc->sc_rd_sel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_rd_sel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -709,7 +709,7 @@ filt_uirdawdetach(struct knote *kn)
 	int s;
 
 	s = splusb();
-	SLIST_REMOVE(&sc->sc_wr_sel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_wr_sel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -727,11 +727,11 @@ uirda_kqfilter(void *h, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_rd_sel.si_klist;
+		klist = &sc->sc_rd_sel.sel_klist;
 		kn->kn_fop = &uirdaread_filtops;
 		break;
 	case EVFILT_WRITE:
-		klist = &sc->sc_wr_sel.si_klist;
+		klist = &sc->sc_wr_sel.sel_klist;
 		kn->kn_fop = &uirdawrite_filtops;
 		break;
 	default:
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 74ebfd1e8ca3..1b4ea98d5489 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.c,v 1.74 2002/10/23 09:14:02 jdolecek Exp $	*/
+/*	$NetBSD: usb.c,v 1.75 2002/11/26 18:49:49 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.74 2002/10/23 09:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.75 2002/11/26 18:49:49 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -600,7 +600,7 @@ filt_usbrdetach(struct knote *kn)
 	int s;
 
 	s = splusb();
-	SLIST_REMOVE(&usb_selevent.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&usb_selevent.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -628,7 +628,7 @@ usbkqfilter(dev_t dev, struct knote *kn)
 	case EVFILT_READ:
 		if (minor(dev) != USB_DEV_MINOR)
 			return (1);
-		klist = &usb_selevent.si_klist;
+		klist = &usb_selevent.sel_klist;
 		kn->kn_fop = &usbread_filtops;
 		break;
 
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index eb54d8184572..b1c3b8f9db42 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uscanner.c,v 1.34 2002/10/23 09:14:03 jdolecek Exp $	*/
+/*	$NetBSD: uscanner.c,v 1.35 2002/11/26 18:49:49 christos Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.34 2002/10/23 09:14:03 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.35 2002/11/26 18:49:49 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -711,7 +711,7 @@ filt_uscannerdetach(struct knote *kn)
 {
 	struct uscanner_softc *sc = kn->kn_hook;
 
-	SLIST_REMOVE(&sc->sc_selq.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_selq.sel_klist, kn, knote, kn_selnext);
 }
 
 static const struct filterops uscanner_seltrue_filtops =
@@ -736,7 +736,7 @@ uscannerkqfilter(dev_t dev, struct knote *kn)
 		 * yield any data or a write will happen.
 		 * Pretend they will.
 		 */
-		klist = &sc->sc_selq.si_klist;
+		klist = &sc->sc_selq.sel_klist;
 		kn->kn_fop = &uscanner_seltrue_filtops;
 		break;
 
diff --git a/sys/dev/usb/ustir.c b/sys/dev/usb/ustir.c
index ae558c55767c..2076106b70f8 100644
--- a/sys/dev/usb/ustir.c
+++ b/sys/dev/usb/ustir.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ustir.c,v 1.5 2002/11/06 10:56:22 dsainty Exp $	*/
+/*	$NetBSD: ustir.c,v 1.6 2002/11/26 18:49:50 christos Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.5 2002/11/06 10:56:22 dsainty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.6 2002/11/26 18:49:50 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1187,7 +1187,7 @@ filt_ustirrdetach(struct knote *kn)
 	int s;
 
 	s = splusb();
-	SLIST_REMOVE(&sc->sc_rd_sel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_rd_sel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -1207,7 +1207,7 @@ filt_ustirwdetach(struct knote *kn)
 	int s;
 
 	s = splusb();
-	SLIST_REMOVE(&sc->sc_wr_sel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&sc->sc_wr_sel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -1234,11 +1234,11 @@ ustir_kqfilter(void *h, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &sc->sc_rd_sel.si_klist;
+		klist = &sc->sc_rd_sel.sel_klist;
 		kn->kn_fop = &ustirread_filtops;
 		break;
 	case EVFILT_WRITE:
-		klist = &sc->sc_wr_sel.si_klist;
+		klist = &sc->sc_wr_sel.sel_klist;
 		kn->kn_fop = &ustirwrite_filtops;
 		break;
 	default:
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 982060eea62e..852906f5cf30 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.11 2002/10/23 09:14:07 jdolecek Exp $ */
+/* $NetBSD: wsevent.c,v 1.12 2002/11/26 18:49:50 christos Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.11 2002/10/23 09:14:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.12 2002/11/26 18:49:50 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
@@ -205,7 +205,7 @@ filt_wseventrdetach(struct knote *kn)
 	int s;
 
 	s = splwsevent();
-	SLIST_REMOVE(&ev->sel.si_klist, kn, knote, kn_selnext);
+	SLIST_REMOVE(&ev->sel.sel_klist, kn, knote, kn_selnext);
 	splx(s);
 }
 
@@ -239,7 +239,7 @@ wsevent_kqfilter(struct wseventvar *ev, struct knote *kn)
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &ev->sel.si_klist;
+		klist = &ev->sel.sel_klist;
 		kn->kn_fop = &wsevent_filtops;
 		break;