Module Name: src
Committed By: jmcneill
Date: Tue Sep 2 09:55:48 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c vchi_bsd.h
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm:
vchiq_kmod_netbsd.c
Log Message:
IPL_VM -> IPL_SCHED, and callout_stop -> callout_halt
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.8 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.9
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.8 Fri Apr 25 15:49:17 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Tue Sep 2 09:55:48 2014
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.8 2014/04/25 15:49:17 skrll Exp $
+ * $Id: vchi_bsd.c,v 1.9 2014/09/02 09:55:48 jmcneill Exp $
*/
#include <sys/types.h>
@@ -106,7 +106,7 @@ int
del_timer_sync(struct timer_list *t)
{
spin_lock(&t->mtx);
- callout_stop(&t->callout);
+ callout_halt(&t->callout, &t->mtx);
spin_unlock(&t->mtx);
spin_lock_destroy(&t->mtx);
@@ -136,7 +136,7 @@ void
_sema_init(struct semaphore *s, int value)
{
memset(s, 0, sizeof(*s));
- mutex_init(&s->mtx, MUTEX_DEFAULT, IPL_VM);
+ mutex_init(&s->mtx, MUTEX_DEFAULT, IPL_SCHED);
cv_init(&s->cv, "semacv");
s->value = value;
}
@@ -314,8 +314,8 @@ vchiq_thread_create(int (*threadfn)(void
va_end(ap);
newt = NULL;
- if (kthread_create(PRI_NONE, 0, NULL, kthread_wrapper, slot, &newt,
- "%s", name) != 0) {
+ if (kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL, kthread_wrapper,
+ slot, &newt, "%s", name) != 0) {
/* Just to be sure */
newt = NULL;
} else {
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.7 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.8
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.7 Sat Apr 12 13:28:41 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Tue Sep 2 09:55:48 2014
@@ -123,7 +123,7 @@ typedef kmutex_t spinlock_t;
*/
#define DEFINE_SPINLOCK(name) kmutex_t name
-#define spin_lock_init(lock) mutex_init(lock, MUTEX_DEFAULT, IPL_VM)
+#define spin_lock_init(lock) mutex_init(lock, MUTEX_DEFAULT, IPL_SCHED)
#define spin_lock_destroy(lock) mutex_destroy(lock)
#define spin_lock(lock) mutex_spin_enter(lock)
#define spin_unlock(lock) mutex_spin_exit(lock)
@@ -148,7 +148,7 @@ typedef kmutex_t rwlock_t;
#define DEFINE_RWLOCK(name) kmutex_t name
-#define rwlock_init(rwlock) mutex_init(rwlock, MUTEX_DEFAULT, IPL_VM)
+#define rwlock_init(rwlock) mutex_init(rwlock, MUTEX_DEFAULT, IPL_SCHED)
#define read_lock(rwlock) mutex_spin_enter(rwlock)
#define read_unlock(rwlock) mutex_spin_exit(rwlock)
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c:1.2 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c:1.3
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c:1.2 Mon Mar 25 22:59:25 2013
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c Tue Sep 2 09:55:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vchiq_kmod_netbsd.c,v 1.2 2013/03/25 22:59:25 jmcneill Exp $ */
+/* $NetBSD: vchiq_kmod_netbsd.c,v 1.3 2014/09/02 09:55:48 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.2 2013/03/25 22:59:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.3 2014/09/02 09:55:48 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,7 +117,7 @@ vchiq_defer(device_t self)
vchiq_core_initialize();
- sc->sc_ih = bcm2835_intr_establish(sc->sc_intr, IPL_VM,
+ sc->sc_ih = bcm2835_intr_establish(sc->sc_intr, IPL_SCHED,
vchiq_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %d\n",
