10 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 868d72fe0110..a0bd578c76c9 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -224,7 +224,7 @@ random_poll(dev_t dev, int events, struct thread *td)
 		if (random_systat.seeded)
 			revents = events & (POLLIN | POLLRDNORM);
 		else
-			selrecord(curthread, &random_systat.rsel);
+			selrecord(td, &random_systat.rsel);
 	}
 	return revents;
 }
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index dd562c1efe9d..c21076ccdab7 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -530,7 +530,7 @@ chn_poll(struct pcm_channel *c, int ev, struct thread *td)
 	if (chn_polltrigger(c) && chn_pollreset(c))
 		ret = ev;
 	else
-		selrecord(curthread, sndbuf_getsel(bs));
+		selrecord(td, sndbuf_getsel(bs));
 	return ret;
 }
 
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 9457ef241b4b..cf2f20bd0b2c 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -562,7 +562,7 @@ usbpoll(dev, events, td)
 			revents |= events & mask;
 		if (revents == 0 && (events & mask)) {
 			DPRINTFN(2,("usb: sleeping on %p\n", &usb_selevent));
-			selrecord(curthread, &usb_selevent);
+			selrecord(td, &usb_selevent);
 		}
 		splx(s);
 
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 35391b0b14a4..44a140136f27 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -745,7 +745,7 @@ kqueue_poll(struct file *fp, int events, struct ucred *cred, struct thread *td)
                 if (kq->kq_count) {
                         revents |= events & (POLLIN | POLLRDNORM);
 		} else {
-                        selrecord(curthread, &kq->kq_sel);
+                        selrecord(td, &kq->kq_sel);
 			kq->kq_state |= KQ_SEL;
 		}
 	}
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 7fa56182af08..b495a796cd5e 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -178,7 +178,7 @@ logpoll(dev_t dev, int events, struct thread *td)
 		if (msgbufp->msg_bufr != msgbufp->msg_bufx)
 			revents |= events & (POLLIN | POLLRDNORM);
 		else
-			selrecord(curthread, &logsoftc.sc_selp);
+			selrecord(td, &logsoftc.sc_selp);
 	}
 	splx(s);
 	return (revents);
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index b543ddff0719..d873f8766463 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1108,12 +1108,12 @@ pipe_poll(fp, events, cred, td)
 
 	if (revents == 0) {
 		if (events & (POLLIN | POLLRDNORM)) {
-			selrecord(curthread, &rpipe->pipe_sel);
+			selrecord(td, &rpipe->pipe_sel);
 			rpipe->pipe_state |= PIPE_SEL;
 		}
 
 		if (events & (POLLOUT | POLLWRNORM)) {
-			selrecord(curthread, &wpipe->pipe_sel);
+			selrecord(td, &wpipe->pipe_sel);
 			wpipe->pipe_state |= PIPE_SEL;
 		}
 	}
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index f4edaaf206ac..a54dcff20861 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1527,12 +1527,12 @@ sopoll(struct socket *so, int events, struct ucred *cred, struct thread *td)
 
 	if (revents == 0) {
 		if (events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
-			selrecord(curthread, &so->so_rcv.sb_sel);
+			selrecord(td, &so->so_rcv.sb_sel);
 			so->so_rcv.sb_flags |= SB_SEL;
 		}
 
 		if (events & (POLLOUT | POLLWRNORM)) {
-			selrecord(curthread, &so->so_snd.sb_sel);
+			selrecord(td, &so->so_snd.sb_sel);
 			so->so_snd.sb_flags |= SB_SEL;
 		}
 	}
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 874fcb6478e9..68e53081f35d 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -990,7 +990,7 @@ bpfpoll(dev, events, td)
 		if (d->bd_hlen != 0 || (d->bd_immediate && d->bd_slen != 0))
 			revents |= events & (POLLIN | POLLRDNORM);
 		else
-			selrecord(curthread, &d->bd_sel);
+			selrecord(td, &d->bd_sel);
 	}
 	BPFD_UNLOCK(d);
 	return (revents);
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index f41fbd32fb8f..b20de7119a95 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -935,7 +935,7 @@ tappoll(dev, events, td)
 			TAPDEBUG("%s%d waiting for data, minor = %#x\n",
 				ifp->if_name, ifp->if_unit, minor(dev));
 
-			selrecord(curthread, &tp->tap_rsel);
+			selrecord(td, &tp->tap_rsel);
 		}
 	}
 
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 92bf7f6f10e9..20f74376d614 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -809,7 +809,7 @@ tunpoll(dev_t dev, int events, struct thread *td)
 		} else {
 			TUNDEBUG("%s%d: tunpoll waiting\n", ifp->if_name,
 			    ifp->if_unit);
-			selrecord(curthread, &tp->tun_rsel);
+			selrecord(td, &tp->tun_rsel);
 		}
 	}
 	if (events & (POLLOUT | POLLWRNORM))