Date: Tue, 2 Dec 2008 07:50:57 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r185550 - user/kmacy/HEAD_fast_multi_xmit/sys/kern Message-ID: <200812020750.mB27ove4052911@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue Dec 2 07:50:57 2008 New Revision: 185550 URL: http://svn.freebsd.org/changeset/base/185550 Log: cast lockarg to struct mtx * Modified: user/kmacy/HEAD_fast_multi_xmit/sys/kern/kern_event.c Modified: user/kmacy/HEAD_fast_multi_xmit/sys/kern/kern_event.c ============================================================================== --- user/kmacy/HEAD_fast_multi_xmit/sys/kern/kern_event.c Tue Dec 2 07:01:18 2008 (r185549) +++ user/kmacy/HEAD_fast_multi_xmit/sys/kern/kern_event.c Tue Dec 2 07:50:57 2008 (r185550) @@ -203,7 +203,7 @@ SYSCTL_INT(_kern, OID_AUTO, kq_calloutma if (list->kl_lock != knlist_mtx_lock) \ list->kl_lock(list->kl_lockarg); \ else \ - mtx_lock(list->kl_lockarg); \ + mtx_lock((struct mtx *)list->kl_lockarg); \ } \ } while (0) #define KN_LIST_UNLOCK(kn) do { \ @@ -438,7 +438,7 @@ knote_fork(struct knlist *list, int pid) if (list->kl_lock != knlist_mtx_lock) list->kl_lock(list->kl_lockarg); else - mtx_lock(list->kl_lockarg); + mtx_lock((struct mtx *)list->kl_lockarg); SLIST_FOREACH(kn, &list->kl_list, kn_selnext) { if ((kn->kn_status & KN_INFLUX) == KN_INFLUX) @@ -493,7 +493,7 @@ knote_fork(struct knlist *list, int pid) if (list->kl_lock != knlist_mtx_lock) list->kl_lock(list->kl_lockarg); else - mtx_lock(list->kl_lockarg); + mtx_lock((struct mtx *)list->kl_lockarg); } list->kl_unlock(list->kl_lockarg); } @@ -1639,7 +1639,7 @@ knote(struct knlist *list, long hint, in if (list->kl_lock != knlist_mtx_lock) list->kl_lock(list->kl_lockarg); else - mtx_lock(list->kl_lockarg); + mtx_lock((struct mtx *)list->kl_lockarg); } /* @@ -1684,7 +1684,7 @@ knlist_add(struct knlist *knl, struct kn if (list->kl_lock != knlist_mtx_lock) list->kl_lock(list->kl_lockarg); else - mtx_lock(list->kl_lockarg); + mtx_lock((struct mtx *)list->kl_lockarg); } SLIST_INSERT_HEAD(&knl->kl_list, kn, kn_selnext); if (!islocked) @@ -1710,7 +1710,7 @@ knlist_remove_kq(struct knlist *knl, str if (list->kl_lock != knlist_mtx_lock) list->kl_lock(list->kl_lockarg); else - mtx_lock(list->kl_lockarg); + mtx_lock((struct mtx *)list->kl_lockarg); } SLIST_REMOVE(&knl->kl_list, kn, knote, kn_selnext); @@ -1837,7 +1837,7 @@ again: /* need to reacquire lock since if (knl->kl_lock != knlist_mtx_lock) knl->kl_lock(knl->kl_lockarg); else - mtx_lock(knl->kl_lockarg); + mtx_lock((struct mtx *)knl->kl_lockarg); } SLIST_FOREACH_SAFE(kn, &knl->kl_list, kn_selnext, kn2) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812020750.mB27ove4052911>