From owner-svn-src-user@FreeBSD.ORG Tue Dec 2 07:50:57 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8D4DB1065688;
Tue, 2 Dec 2008 07:50:57 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 8AF648FC1E;
Tue, 2 Dec 2008 07:50:57 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB27ovAb052912;
Tue, 2 Dec 2008 07:50:57 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB27ove4052911;
Tue, 2 Dec 2008 07:50:57 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812020750.mB27ove4052911@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 2 Dec 2008 07:50:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r185550 - user/kmacy/HEAD_fast_multi_xmit/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Dec 2008 07:50:57 -0000
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) {