Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/macppc/dev/apm.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/macppc/dev/apm.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -p -r1.28 -r1.28.2.1 --- src/sys/arch/macppc/dev/apm.c 2020/10/30 22:20:38 1.28 +++ src/sys/arch/macppc/dev/apm.c 2021/01/03 16:34:55 1.28.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: apm.c,v 1.28 2020/10/30 22:20:38 christos Exp $ */ +/* $NetBSD: apm.c,v 1.28.2.1 2021/01/03 16:34:55 thorpej Exp $ */ /* $OpenBSD: apm.c,v 1.5 2002/06/07 07:13:59 miod Exp $ */ /*- @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.28 2020/10/30 22:20:38 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.28.2.1 2021/01/03 16:34:55 thorpej Exp $"); #include "apm.h" @@ -418,7 +418,7 @@ filt_apmrdetach(struct knote *kn) struct apm_softc *sc = (struct apm_softc *)kn->kn_hook; APM_LOCK(sc); - SLIST_REMOVE(&sc->sc_rsel.sel_klist, kn, knote, kn_selnext); + selremove_knote(&sc->sc_rsel, kn); APM_UNLOCK(sc); } @@ -442,11 +442,9 @@ int apmkqfilter(dev_t dev, struct knote *kn) { struct apm_softc *sc = device_lookup_private(&apm_cd,APMUNIT(dev)); - struct klist *klist; switch (kn->kn_filter) { case EVFILT_READ: - klist = &sc->sc_rsel.sel_klist; kn->kn_fop = &apmread_filtops; break; default: @@ -456,7 +454,7 @@ apmkqfilter(dev_t dev, struct knote *kn) kn->kn_hook = sc; APM_LOCK(sc); - SLIST_INSERT_HEAD(klist, kn, kn_selnext); + selrecord_knote(&sc->sc_rsel, kn); APM_UNLOCK(sc); return (0);