Use <sys/lock.h> provided by Newlib

14 files changed, 15 insertions, 15 deletions

diff --git a/freebsd/sys/sys/_lock.h b/freebsd/sys/sys/_lock.h
index 2ab3d996..e92430c4 100644
--- a/freebsd/sys/sys/_lock.h
+++ b/freebsd/sys/sys/_lock.h
@@ -34,11 +34,11 @@
 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. */
 	struct	witness *lo_witness;	/* Data for witness. */
+#else /* __rtems__ */
+	unsigned int lo_flags;
 #endif /* __rtems__ */
 };
 
diff --git a/freebsd/sys/sys/buf.h b/freebsd/sys/sys/buf.h
index ea6019c1..830fb054 100644
--- a/freebsd/sys/sys/buf.h
+++ b/freebsd/sys/sys/buf.h
@@ -40,7 +40,7 @@
 
 #include <sys/bufobj.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/lockmgr.h>
 
 struct bio;
diff --git a/freebsd/sys/sys/buf_ring.h b/freebsd/sys/sys/buf_ring.h
index 86534564..3655775e 100644
--- a/freebsd/sys/sys/buf_ring.h
+++ b/freebsd/sys/sys/buf_ring.h
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef DEBUG_BUFRING
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/mutex.h>
 #endif
 
diff --git a/freebsd/sys/sys/eventhandler.h b/freebsd/sys/sys/eventhandler.h
index d03cd054..b071c639 100644
--- a/freebsd/sys/sys/eventhandler.h
+++ b/freebsd/sys/sys/eventhandler.h
@@ -29,7 +29,7 @@
 #ifndef _SYS_EVENTHANDLER_H_
 #define _SYS_EVENTHANDLER_H_
 
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/ktr.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
diff --git a/freebsd/sys/sys/fail.h b/freebsd/sys/sys/fail.h
index 34aa593f..34695bc8 100644
--- a/freebsd/sys/sys/fail.h
+++ b/freebsd/sys/sys/fail.h
@@ -39,7 +39,7 @@
 #include <sys/sysctl.h>
 #include <sys/condvar.h>
 #include <sys/kernel.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 
diff --git a/freebsd/sys/sys/filedesc.h b/freebsd/sys/sys/filedesc.h
index 6b4dd1ee..579e5213 100644
--- a/freebsd/sys/sys/filedesc.h
+++ b/freebsd/sys/sys/filedesc.h
@@ -36,7 +36,7 @@
 #include <sys/caprights.h>
 #include <sys/queue.h>
 #include <sys/event.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/priority.h>
 #include <sys/seq.h>
 #include <sys/sx.h>
diff --git a/freebsd/sys/sys/hhook.h b/freebsd/sys/sys/hhook.h
index 7de47d48..1d60dd3b 100644
--- a/freebsd/sys/sys/hhook.h
+++ b/freebsd/sys/sys/hhook.h
@@ -50,7 +50,7 @@
 #define _SYS_HHOOK_H_
 
 /* XXXLAS: Is there a way around this? */
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/rmlock.h>
 
 /* hhook_head flags. */
diff --git a/freebsd/sys/sys/jail.h b/freebsd/sys/sys/jail.h
index 5fcbaf39..c67c8f55 100644
--- a/freebsd/sys/sys/jail.h
+++ b/freebsd/sys/sys/jail.h
@@ -118,7 +118,7 @@ int jail_remove(int);
 
 #include <sys/queue.h>
 #include <sys/sysctl.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/_task.h>
 
diff --git a/freebsd/sys/sys/lock_profile.h b/freebsd/sys/sys/lock_profile.h
index 579113a7..bf73ca14 100644
--- a/freebsd/sys/sys/lock_profile.h
+++ b/freebsd/sys/sys/lock_profile.h
@@ -37,7 +37,7 @@ LIST_HEAD(lpohead, lock_profile_object);
 #ifdef _KERNEL
 #ifdef LOCK_PROFILING
 #include <machine/cpufunc.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 
 #ifndef USE_CPU_NANOSECONDS
 u_int64_t nanoseconds(void);
diff --git a/freebsd/sys/sys/mbuf.h b/freebsd/sys/sys/mbuf.h
index 4631a535..bd62c1cf 100644
--- a/freebsd/sys/sys/mbuf.h
+++ b/freebsd/sys/sys/mbuf.h
@@ -40,7 +40,7 @@
 #include <sys/systm.h>
 #include <vm/uma.h>
 #ifdef WITNESS
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #endif
 #endif
 
diff --git a/freebsd/sys/sys/mount.h b/freebsd/sys/sys/mount.h
index e132159d..9800d97d 100644
--- a/freebsd/sys/sys/mount.h
+++ b/freebsd/sys/sys/mount.h
@@ -36,7 +36,7 @@
 #include <sys/ucred.h>
 #include <sys/queue.h>
 #ifdef _KERNEL
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/lockmgr.h>
 #include <sys/_mutex.h>
 #include <sys/_sx.h>
diff --git a/freebsd/sys/sys/seq.h b/freebsd/sys/sys/seq.h
index 94be8a4c..405e3466 100644
--- a/freebsd/sys/sys/seq.h
+++ b/freebsd/sys/sys/seq.h
@@ -64,7 +64,7 @@ typedef uint32_t seq_t;
  */		
 
 /* A hack to get MPASS macro */
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 
 #include <machine/cpu.h>
 
diff --git a/freebsd/sys/sys/tty.h b/freebsd/sys/sys/tty.h
index d6d6ee64..09e04195 100644
--- a/freebsd/sys/sys/tty.h
+++ b/freebsd/sys/sys/tty.h
@@ -34,7 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/selinfo.h>
diff --git a/freebsd/sys/sys/vnode.h b/freebsd/sys/sys/vnode.h
index 0d8c6521..535016ed 100644
--- a/freebsd/sys/sys/vnode.h
+++ b/freebsd/sys/sys/vnode.h
@@ -35,7 +35,7 @@
 
 #include <sys/bufobj.h>
 #include <sys/queue.h>
-#include <rtems/bsd/sys/lock.h>
+#include <sys/lock.h>
 #include <sys/lockmgr.h>
 #include <sys/mutex.h>
 #include <sys/rangelock.h>