Module Name: src
Committed By: skrll
Date: Sun Nov 5 09:11:43 UTC 2017
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:
Use IPL_VM and IST_MPSAFE instead of IPL_SCHED
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
cvs rdiff -u -r1.8 -r1.9 \
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.9 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.10
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.9 Tue Sep 2 09:55:48 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Sun Nov 5 09:11:43 2017
@@ -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.9 2014/09/02 09:55:48 jmcneill Exp $
+ * $Id: vchi_bsd.c,v 1.10 2017/11/05 09:11:43 skrll Exp $
*/
#include <sys/types.h>
@@ -136,7 +136,7 @@ void
_sema_init(struct semaphore *s, int value)
{
memset(s, 0, sizeof(*s));
- mutex_init(&s->mtx, MUTEX_DEFAULT, IPL_SCHED);
+ mutex_init(&s->mtx, MUTEX_DEFAULT, IPL_VM);
cv_init(&s->cv, "semacv");
s->value = value;
}
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.13 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.14
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.13 Mon Sep 11 07:33:45 2017
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Sun Nov 5 09:11:43 2017
@@ -84,7 +84,7 @@ typedef kmutex_t spinlock_t;
*/
#define DEFINE_SPINLOCK(name) kmutex_t name
-#define spin_lock_init(lock) mutex_init(lock, MUTEX_DEFAULT, IPL_SCHED)
+#define spin_lock_init(lock) mutex_init(lock, MUTEX_DEFAULT, IPL_VM)
#define spin_lock_destroy(lock) mutex_destroy(lock)
#define spin_lock(lock) mutex_spin_enter(lock)
#define spin_unlock(lock) mutex_spin_exit(lock)
@@ -109,7 +109,7 @@ typedef kmutex_t rwlock_t;
#define DEFINE_RWLOCK(name) kmutex_t name
-#define rwlock_init(rwlock) mutex_init(rwlock, MUTEX_DEFAULT, IPL_SCHED)
+#define rwlock_init(rwlock) mutex_init(rwlock, MUTEX_DEFAULT, IPL_VM)
#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.8 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c:1.9
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c:1.8 Thu Sep 21 19:29:35 2017
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c Sun Nov 5 09:11:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vchiq_kmod_netbsd.c,v 1.8 2017/09/21 19:29:35 skrll Exp $ */
+/* $NetBSD: vchiq_kmod_netbsd.c,v 1.9 2017/11/05 09:11:43 skrll 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.8 2017/09/21 19:29:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.9 2017/11/05 09:11:43 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,7 +125,7 @@ vchiq_defer(device_t self)
vchiq_core_initialize();
- sc->sc_ih = intr_establish(sc->sc_intr, IPL_SCHED, IST_LEVEL,
+ sc->sc_ih = intr_establish(sc->sc_intr, IPL_VM, IST_LEVEL | IST_MPSAFE,
vchiq_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %d\n",
