[rtems-libbsd commit] rtems-bsd-mutex: Use thread queue name

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    master
Commit:    ee94f8a8ea6ad5e2a6ed4096ea65d494fe5d4161
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=ee94f8a8ea6ad5e2a6ed4096ea65d494fe5d4161

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Jan 31 09:49:49 2017 +0100

rtems-bsd-mutex: Use thread queue name

---

 freebsd/sys/kern/subr_lock.c                   | 2 ++
 freebsd/sys/sys/_lock.h                        | 2 ++
 rtemsbsd/include/machine/rtems-bsd-muteximpl.h | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/freebsd/sys/kern/subr_lock.c b/freebsd/sys/kern/subr_lock.c
index 83c6301..5aba894 100644
--- a/freebsd/sys/kern/subr_lock.c
+++ b/freebsd/sys/kern/subr_lock.c
@@ -93,7 +93,9 @@ lock_init(struct lock_object *lock, struct lock_class *class, const char *name,
 	KASSERT(i < LOCK_CLASS_MAX, ("unknown lock class %p", class));
 
 	/* Initialize the lock object. */
+#ifndef __rtems__
 	lock->lo_name = name;
+#endif /* __rtems__ */
 	lock->lo_flags |= flags | LO_INITIALIZED;
 	LOCK_LOG_INIT(lock, 0);
 	WITNESS_INIT(lock, (type != NULL) ? type : name);
diff --git a/freebsd/sys/sys/_lock.h b/freebsd/sys/sys/_lock.h
index 35decd7..2ab3d99 100644
--- a/freebsd/sys/sys/_lock.h
+++ b/freebsd/sys/sys/_lock.h
@@ -32,7 +32,9 @@
 #define	_SYS__LOCK_H_
 
 struct lock_object {
+#ifndef __rtems__
 	const	char *lo_name;		/* Individual lock name. */
+#endif /* __rtems__ */
 	u_int	lo_flags;
 #ifndef __rtems__
 	u_int	lo_data;		/* General class specific data. */
diff --git a/rtemsbsd/include/machine/rtems-bsd-muteximpl.h b/rtemsbsd/include/machine/rtems-bsd-muteximpl.h
index fdad3f1..71a7cbd 100644
--- a/rtemsbsd/include/machine/rtems-bsd-muteximpl.h
+++ b/rtemsbsd/include/machine/rtems-bsd-muteximpl.h
@@ -61,7 +61,7 @@ static inline void
 rtems_bsd_mutex_init(struct lock_object *lock, rtems_bsd_mutex *m,
     struct lock_class *class, const char *name, const char *type, int flags)
 {
-	_Thread_queue_Initialize(&m->queue);
+	_Thread_queue_Initialize(&m->queue, name);
 	m->nest_level = 0;
 
 	lock_init(lock, class, name, type, flags);