[rtems-libbsd commit] Directly use <sys/time.h> provided by Newlib

Sebastian Huber sebh at rtems.org
Mon May 30 14:18:18 UTC 2016


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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Apr  7 09:48:12 2016 +0200

Directly use <sys/time.h> provided by Newlib

---

 builder.py                                   |  1 -
 dhcpcd/config.h                              |  2 +-
 freebsd/contrib/libpcap/nametoaddr.c         |  2 +-
 freebsd/contrib/libpcap/pcap/pcap.h          |  2 +-
 freebsd/contrib/tcpdump/tcpdump-stdinc.h     |  2 +-
 freebsd/lib/libc/include/isc/eventlib.h      |  2 +-
 freebsd/lib/libc/net/name6.c                 |  2 +-
 freebsd/lib/libc/resolv/res_data.c           |  2 +-
 freebsd/lib/libc/resolv/res_findzonecut.c    |  2 +-
 freebsd/lib/libc/resolv/res_init.c           |  2 +-
 freebsd/lib/libc/resolv/res_send.c           |  2 +-
 freebsd/lib/libc/resolv/res_update.c         |  2 +-
 freebsd/sbin/dhclient/dhcpd.h                |  2 +-
 freebsd/sbin/ifconfig/ifconfig.c             |  2 +-
 freebsd/sbin/ifconfig/ifieee80211.c          |  2 +-
 freebsd/sbin/ifconfig/ifmedia.c              |  2 +-
 freebsd/sbin/ping/ping.c                     |  2 +-
 freebsd/sbin/ping6/ping6.c                   |  2 +-
 freebsd/sbin/sysctl/sysctl.c                 |  2 +-
 freebsd/sys/cam/cam_ccb.h                    |  2 +-
 freebsd/sys/contrib/altq/altq/altq_cbq.c     |  2 +-
 freebsd/sys/contrib/altq/altq/altq_red.c     |  2 +-
 freebsd/sys/contrib/altq/altq/altq_rmclass.c |  2 +-
 freebsd/sys/contrib/pf/net/if_pfsync.c       |  2 +-
 freebsd/sys/contrib/pf/net/pf.c              |  2 +-
 freebsd/sys/contrib/pf/net/pf_if.c           |  2 +-
 freebsd/sys/contrib/pf/net/pf_ioctl.c        |  2 +-
 freebsd/sys/contrib/pf/net/pf_lb.c           |  2 +-
 freebsd/sys/contrib/pf/net/pf_norm.c         |  2 +-
 freebsd/sys/contrib/pf/net/pf_subr.c         |  4 +--
 freebsd/sys/crypto/blowfish/bf_skey.c        |  2 +-
 freebsd/sys/crypto/sha1.c                    |  2 +-
 freebsd/sys/crypto/sha2/sha2.c               |  2 +-
 freebsd/sys/kern/kern_time.c                 |  2 +-
 freebsd/sys/libkern/arc4random.c             |  2 +-
 freebsd/sys/net/bpf.c                        |  2 +-
 freebsd/sys/net/if.h                         |  2 +-
 freebsd/sys/net/if_bridge.c                  |  2 +-
 freebsd/sys/net/if_faith.c                   |  2 +-
 freebsd/sys/net/if_gif.c                     |  2 +-
 freebsd/sys/netinet/ip_carp.c                |  2 +-
 freebsd/sys/netinet/ip_gre.c                 |  2 +-
 freebsd/sys/netinet/ip_icmp.c                |  2 +-
 freebsd/sys/netinet/ip_id.c                  |  2 +-
 freebsd/sys/netinet/ip_input.c               |  2 +-
 freebsd/sys/netinet/ip_mroute.c              |  2 +-
 freebsd/sys/netinet/ip_options.c             |  2 +-
 freebsd/sys/netinet/ipfw/ip_dn_glue.c        |  2 +-
 freebsd/sys/netinet/ipfw/ip_dn_io.c          |  2 +-
 freebsd/sys/netinet/ipfw/ip_dummynet.c       |  2 +-
 freebsd/sys/netinet/libalias/alias_db.c      |  2 +-
 freebsd/sys/netinet/libalias/alias_sctp.h    |  2 +-
 freebsd/sys/netinet/sctp_header.h            |  2 +-
 freebsd/sys/netinet6/dest6.c                 |  2 +-
 freebsd/sys/netinet6/frag6.c                 |  2 +-
 freebsd/sys/netinet6/icmp6.c                 |  2 +-
 freebsd/sys/netinet6/in6.c                   |  2 +-
 freebsd/sys/netinet6/in6_pcb.c               |  2 +-
 freebsd/sys/netinet6/in6_src.c               |  2 +-
 freebsd/sys/netinet6/ip6_forward.c           |  2 +-
 freebsd/sys/netinet6/ip6_input.c             |  2 +-
 freebsd/sys/netinet6/ip6_mroute.c            |  2 +-
 freebsd/sys/netinet6/nd6.c                   |  2 +-
 freebsd/sys/netinet6/nd6_nbr.c               |  2 +-
 freebsd/sys/netinet6/nd6_rtr.c               |  2 +-
 freebsd/sys/netipsec/ipsec.c                 |  2 +-
 freebsd/sys/netpfil/ipfw/ip_dn_glue.c        |  2 +-
 freebsd/sys/netpfil/ipfw/ip_dn_io.c          |  2 +-
 freebsd/sys/netpfil/ipfw/ip_dummynet.c       |  2 +-
 freebsd/sys/opencrypto/xform.c               |  2 +-
 freebsd/sys/rpc/types.h                      |  2 +-
 freebsd/sys/sys/proc.h                       |  2 +-
 freebsd/sys/sys/user.h                       |  2 +-
 freebsd/usr.bin/netstat/if.c                 |  2 +-
 freebsd/usr.bin/netstat/mroute.c             |  2 +-
 freebsd/usr.bin/netstat/mroute6.c            |  2 +-
 freebsd/usr.bin/netstat/route.c              |  2 +-
 rtemsbsd/include/rtems/bsd/sys/param.h       |  2 +-
 rtemsbsd/include/rtems/bsd/sys/time.h        | 53 ----------------------------
 79 files changed, 78 insertions(+), 132 deletions(-)

diff --git a/builder.py b/builder.py
index aa5d409..b3d5411 100755
--- a/builder.py
+++ b/builder.py
@@ -181,7 +181,6 @@ def mapCPUDependentPath(path):
 
 def fixIncludes(data):
     data = re.sub('#include <sys/lock.h>',     '#include <rtems/bsd/sys/lock.h>', data)
-    data = re.sub('#include <sys/time.h>',     '#include <rtems/bsd/sys/time.h>', data)
     data = re.sub('#include <sys/cpuset.h>',   '#include <rtems/bsd/sys/cpuset.h>', data)
     data = re.sub('#include <sys/errno.h>',    '#include <rtems/bsd/sys/errno.h>', data)
     data = re.sub('#include <sys/param.h>',    '#include <rtems/bsd/sys/param.h>', data)
diff --git a/dhcpcd/config.h b/dhcpcd/config.h
index b2a4960..27174eb 100644
--- a/dhcpcd/config.h
+++ b/dhcpcd/config.h
@@ -8,7 +8,7 @@
 #define LIBEXECDIR	"/libexec"
 #define DBDIR		"/var/db"
 #define RUNDIR		"/var/run"
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <machine/rtems-bsd-program.h>
 #include <machine/rtems-bsd-commands.h>
 #include <spawn.h>
diff --git a/freebsd/contrib/libpcap/nametoaddr.c b/freebsd/contrib/libpcap/nametoaddr.c
index af76174..e5653b9 100644
--- a/freebsd/contrib/libpcap/nametoaddr.c
+++ b/freebsd/contrib/libpcap/nametoaddr.c
@@ -48,7 +48,7 @@ static const char rcsid[] _U_ =
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/types.h>				/* concession to AIX */
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <netinet/in.h>
 #endif /* WIN32 */
diff --git a/freebsd/contrib/libpcap/pcap/pcap.h b/freebsd/contrib/libpcap/pcap/pcap.h
index 60bb36e..c9c6107 100644
--- a/freebsd/contrib/libpcap/pcap/pcap.h
+++ b/freebsd/contrib/libpcap/pcap/pcap.h
@@ -44,7 +44,7 @@
   #include <sys/socket.h>  /* u_int, u_char etc. */
 #else /* UN*X */
   #include <rtems/bsd/sys/types.h>
-  #include <rtems/bsd/sys/time.h>
+  #include <sys/time.h>
 #endif /* WIN32/MSDOS/UN*X */
 
 #include <net/bpf.h>
diff --git a/freebsd/contrib/tcpdump/tcpdump-stdinc.h b/freebsd/contrib/tcpdump/tcpdump-stdinc.h
index 411326a..e5e26ec 100644
--- a/freebsd/contrib/tcpdump/tcpdump-stdinc.h
+++ b/freebsd/contrib/tcpdump/tcpdump-stdinc.h
@@ -119,7 +119,7 @@ typedef char* caddr_t;
 #endif
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/types.h>			/* concession to AIX */
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
diff --git a/freebsd/lib/libc/include/isc/eventlib.h b/freebsd/lib/libc/include/isc/eventlib.h
index d303bf3..7a5a095 100644
--- a/freebsd/lib/libc/include/isc/eventlib.h
+++ b/freebsd/lib/libc/include/isc/eventlib.h
@@ -26,7 +26,7 @@
 
 #include <rtems/bsd/sys/types.h>
 #include <sys/uio.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <stdio.h>
 
 #include <isc/platform.h>
diff --git a/freebsd/lib/libc/net/name6.c b/freebsd/lib/libc/net/name6.c
index 892a527..2a93efc 100644
--- a/freebsd/lib/libc/net/name6.c
+++ b/freebsd/lib/libc/net/name6.c
@@ -95,7 +95,7 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/queue.h>
 #include <netinet/in.h>
 #ifdef INET6
diff --git a/freebsd/lib/libc/resolv/res_data.c b/freebsd/lib/libc/resolv/res_data.c
index a5164c4..47501f3 100644
--- a/freebsd/lib/libc/resolv/res_data.c
+++ b/freebsd/lib/libc/resolv/res_data.c
@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/freebsd/lib/libc/resolv/res_findzonecut.c b/freebsd/lib/libc/resolv/res_findzonecut.c
index aa6efcf..e776a1e 100644
--- a/freebsd/lib/libc/resolv/res_findzonecut.c
+++ b/freebsd/lib/libc/resolv/res_findzonecut.c
@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/freebsd/lib/libc/resolv/res_init.c b/freebsd/lib/libc/resolv/res_init.c
index cf6449f..7a5f07b 100644
--- a/freebsd/lib/libc/resolv/res_init.c
+++ b/freebsd/lib/libc/resolv/res_init.c
@@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/types.h>
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/freebsd/lib/libc/resolv/res_send.c b/freebsd/lib/libc/resolv/res_send.c
index 6896113..95038f7 100644
--- a/freebsd/lib/libc/resolv/res_send.c
+++ b/freebsd/lib/libc/resolv/res_send.c
@@ -86,7 +86,7 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include <rtems/bsd/sys/types.h>
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 
diff --git a/freebsd/lib/libc/resolv/res_update.c b/freebsd/lib/libc/resolv/res_update.c
index cd3abbd..d29c47f 100644
--- a/freebsd/lib/libc/resolv/res_update.c
+++ b/freebsd/lib/libc/resolv/res_update.c
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/param.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/freebsd/sbin/dhclient/dhcpd.h b/freebsd/sbin/dhclient/dhcpd.h
index d7844bc..030a96a 100644
--- a/freebsd/sbin/dhclient/dhcpd.h
+++ b/freebsd/sbin/dhclient/dhcpd.h
@@ -46,7 +46,7 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/stat.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/un.h>
 #include <sys/wait.h>
 
diff --git a/freebsd/sbin/ifconfig/ifconfig.c b/freebsd/sbin/ifconfig/ifconfig.c
index 8fc53f6..0bfc529 100644
--- a/freebsd/sbin/ifconfig/ifconfig.c
+++ b/freebsd/sbin/ifconfig/ifconfig.c
@@ -54,7 +54,7 @@ static const char rcsid[] =
 #include <rtems/bsd/sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/module.h>
 #include <sys/linker.h>
 
diff --git a/freebsd/sbin/ifconfig/ifieee80211.c b/freebsd/sbin/ifconfig/ifieee80211.c
index 4647317..29b49a5 100644
--- a/freebsd/sbin/ifconfig/ifieee80211.c
+++ b/freebsd/sbin/ifconfig/ifieee80211.c
@@ -68,7 +68,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/freebsd/sbin/ifconfig/ifmedia.c b/freebsd/sbin/ifconfig/ifmedia.c
index 0ad008e..ba029cb 100644
--- a/freebsd/sbin/ifconfig/ifmedia.c
+++ b/freebsd/sbin/ifconfig/ifmedia.c
@@ -68,7 +68,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/freebsd/sbin/ping/ping.c b/freebsd/sbin/ping/ping.c
index 7f0a229..0bfd3f5 100644
--- a/freebsd/sbin/ping/ping.c
+++ b/freebsd/sbin/ping/ping.c
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/param.h>		/* NB: we rely on this for <sys/types.h> */
 #include <sys/socket.h>
 #include <sys/sysctl.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/uio.h>
 
 #include <netinet/in.h>
diff --git a/freebsd/sbin/ping6/ping6.c b/freebsd/sbin/ping6/ping6.c
index 2067b54..704b455 100644
--- a/freebsd/sbin/ping6/ping6.c
+++ b/freebsd/sbin/ping6/ping6.c
@@ -115,7 +115,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/param.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/route.h>
diff --git a/freebsd/sbin/sysctl/sysctl.c b/freebsd/sbin/sysctl/sysctl.c
index 9d7a869..96b1c91 100644
--- a/freebsd/sbin/sysctl/sysctl.c
+++ b/freebsd/sbin/sysctl/sysctl.c
@@ -50,7 +50,7 @@ static const char rcsid[] =
 #endif /* __rtems__ */
 
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <rtems/bsd/sys/resource.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/freebsd/sys/cam/cam_ccb.h b/freebsd/sys/cam/cam_ccb.h
index 4222de9..359064b 100644
--- a/freebsd/sys/cam/cam_ccb.h
+++ b/freebsd/sys/cam/cam_ccb.h
@@ -33,7 +33,7 @@
 
 #include <sys/queue.h>
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/limits.h>
 #ifndef _KERNEL
 #include <sys/callout.h>
diff --git a/freebsd/sys/contrib/altq/altq/altq_cbq.c b/freebsd/sys/contrib/altq/altq/altq_cbq.c
index 6ebf655..25d04b7 100644
--- a/freebsd/sys/contrib/altq/altq/altq_cbq.c
+++ b/freebsd/sys/contrib/altq/altq/altq_cbq.c
@@ -49,7 +49,7 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifdef ALTQ3_COMPAT
 #include <sys/uio.h>
 #include <sys/kernel.h>
diff --git a/freebsd/sys/contrib/altq/altq/altq_red.c b/freebsd/sys/contrib/altq/altq/altq_red.c
index 7d1ad73..0d9ab93 100644
--- a/freebsd/sys/contrib/altq/altq/altq_red.c
+++ b/freebsd/sys/contrib/altq/altq/altq_red.c
@@ -83,7 +83,7 @@
 #include <sys/kernel.h>
 #ifdef ALTQ_FLOWVALVE
 #include <sys/queue.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #endif
 #endif /* ALTQ3_COMPAT */
 
diff --git a/freebsd/sys/contrib/altq/altq/altq_rmclass.c b/freebsd/sys/contrib/altq/altq/altq_rmclass.c
index b385f78..1fa47cc 100644
--- a/freebsd/sys/contrib/altq/altq/altq_rmclass.c
+++ b/freebsd/sys/contrib/altq/altq/altq_rmclass.c
@@ -56,7 +56,7 @@
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifdef ALTQ3_COMPAT
 #include <sys/kernel.h>
 #endif
diff --git a/freebsd/sys/contrib/pf/net/if_pfsync.c b/freebsd/sys/contrib/pf/net/if_pfsync.c
index 36cb157..39d4be6 100644
--- a/freebsd/sys/contrib/pf/net/if_pfsync.c
+++ b/freebsd/sys/contrib/pf/net/if_pfsync.c
@@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <sys/proc.h>
 #include <sys/systm.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #ifdef __FreeBSD__
diff --git a/freebsd/sys/contrib/pf/net/pf.c b/freebsd/sys/contrib/pf/net/pf.c
index edb4b2e..e6dc05f 100644
--- a/freebsd/sys/contrib/pf/net/pf.c
+++ b/freebsd/sys/contrib/pf/net/pf.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/kernel.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifdef __FreeBSD__
 #include <sys/random.h>
 #include <sys/sysctl.h>
diff --git a/freebsd/sys/contrib/pf/net/pf_if.c b/freebsd/sys/contrib/pf/net/pf_if.c
index 3ac645f..d730cd5 100644
--- a/freebsd/sys/contrib/pf/net/pf_if.c
+++ b/freebsd/sys/contrib/pf/net/pf_if.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #ifndef __FreeBSD__
 #include <sys/device.h>
 #endif
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifndef __FreeBSD__
 #include <sys/pool.h>
 #endif
diff --git a/freebsd/sys/contrib/pf/net/pf_ioctl.c b/freebsd/sys/contrib/pf/net/pf_ioctl.c
index 9cfa9b3..fc3c823 100644
--- a/freebsd/sys/contrib/pf/net/pf_ioctl.c
+++ b/freebsd/sys/contrib/pf/net/pf_ioctl.c
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/kernel.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifdef __FreeBSD__
 #include <sys/ucred.h>
 #include <sys/jail.h>
diff --git a/freebsd/sys/contrib/pf/net/pf_lb.c b/freebsd/sys/contrib/pf/net/pf_lb.c
index 16faac0..4ac68ac 100644
--- a/freebsd/sys/contrib/pf/net/pf_lb.c
+++ b/freebsd/sys/contrib/pf/net/pf_lb.c
@@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/kernel.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifdef  __FreeBSD__
 #include <sys/sysctl.h>
 #endif
diff --git a/freebsd/sys/contrib/pf/net/pf_norm.c b/freebsd/sys/contrib/pf/net/pf_norm.c
index 3780fa8..6ee39e6 100644
--- a/freebsd/sys/contrib/pf/net/pf_norm.c
+++ b/freebsd/sys/contrib/pf/net/pf_norm.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/fcntl.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifndef __FreeBSD__
 #include <sys/pool.h>
 
diff --git a/freebsd/sys/contrib/pf/net/pf_subr.c b/freebsd/sys/contrib/pf/net/pf_subr.c
index cf562ce..3ae1812 100644
--- a/freebsd/sys/contrib/pf/net/pf_subr.c
+++ b/freebsd/sys/contrib/pf/net/pf_subr.c
@@ -41,12 +41,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/libkern.h>
 #include <sys/mbuf.h>
 #include <sys/md5.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/random.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
diff --git a/freebsd/sys/crypto/blowfish/bf_skey.c b/freebsd/sys/crypto/blowfish/bf_skey.c
index a396d87..7cff474 100644
--- a/freebsd/sys/crypto/blowfish/bf_skey.c
+++ b/freebsd/sys/crypto/blowfish/bf_skey.c
@@ -65,7 +65,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/types.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/systm.h>
 #include <crypto/blowfish/blowfish.h>
 #include <crypto/blowfish/bf_locl.h>
diff --git a/freebsd/sys/crypto/sha1.c b/freebsd/sys/crypto/sha1.c
index f2c5330..0fc2de3 100644
--- a/freebsd/sys/crypto/sha1.c
+++ b/freebsd/sys/crypto/sha1.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/types.h>
 #include <sys/cdefs.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/systm.h>
 
 #include <crypto/sha1.h>
diff --git a/freebsd/sys/crypto/sha2/sha2.c b/freebsd/sys/crypto/sha2/sha2.c
index acabc95..8a482f5 100644
--- a/freebsd/sys/crypto/sha2/sha2.c
+++ b/freebsd/sys/crypto/sha2/sha2.c
@@ -40,7 +40,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <rtems/bsd/sys/types.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #else
diff --git a/freebsd/sys/kern/kern_time.c b/freebsd/sys/kern/kern_time.c
index 2050d03..44bd206 100644
--- a/freebsd/sys/kern/kern_time.c
+++ b/freebsd/sys/kern/kern_time.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/posix4.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/timers.h>
 #include <sys/timetc.h>
 #include <sys/vnode.h>
diff --git a/freebsd/sys/libkern/arc4random.c b/freebsd/sys/libkern/arc4random.c
index 32ca015..f33fc82 100644
--- a/freebsd/sys/libkern/arc4random.c
+++ b/freebsd/sys/libkern/arc4random.c
@@ -20,7 +20,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/libkern.h>
 #include <rtems/bsd/sys/lock.h>
 #include <sys/mutex.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #define	ARC4_RESEED_BYTES 65536
 #define	ARC4_RESEED_SECONDS 300
diff --git a/freebsd/sys/net/bpf.c b/freebsd/sys/net/bpf.c
index 6a6778b..fd9432a 100644
--- a/freebsd/sys/net/bpf.c
+++ b/freebsd/sys/net/bpf.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/jail.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
diff --git a/freebsd/sys/net/if.h b/freebsd/sys/net/if.h
index 5795baa..e182db5 100644
--- a/freebsd/sys/net/if.h
+++ b/freebsd/sys/net/if.h
@@ -46,7 +46,7 @@
  * The same holds for <sys/socket.h>.  (struct sockaddr ifru_addr)
  */
 #ifndef _KERNEL
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 #endif
 
diff --git a/freebsd/sys/net/if_bridge.c b/freebsd/sys/net/if_bridge.c
index c8533f0..6555309 100644
--- a/freebsd/sys/net/if_bridge.c
+++ b/freebsd/sys/net/if_bridge.c
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/systm.h>
 #include <sys/jail.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/socket.h> /* for net/if.h */
 #include <sys/sockio.h>
 #include <sys/ctype.h>  /* string functions */
diff --git a/freebsd/sys/net/if_faith.c b/freebsd/sys/net/if_faith.c
index 858774d..a1db9fe 100644
--- a/freebsd/sys/net/if_faith.c
+++ b/freebsd/sys/net/if_faith.c
@@ -52,7 +52,7 @@
 #include <sys/socket.h>
 #include <rtems/bsd/sys/errno.h>
 #include <sys/sockio.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/queue.h>
 #include <rtems/bsd/sys/types.h>
 #include <sys/malloc.h>
diff --git a/freebsd/sys/net/if_gif.c b/freebsd/sys/net/if_gif.c
index 316a395..27cbbdd 100644
--- a/freebsd/sys/net/if_gif.c
+++ b/freebsd/sys/net/if_gif.c
@@ -45,7 +45,7 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/priv.h>
diff --git a/freebsd/sys/netinet/ip_carp.c b/freebsd/sys/netinet/ip_carp.c
index a34c10c..b7b712b 100644
--- a/freebsd/sys/netinet/ip_carp.c
+++ b/freebsd/sys/netinet/ip_carp.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
diff --git a/freebsd/sys/netinet/ip_gre.c b/freebsd/sys/netinet/ip_gre.c
index 25c9698..9289be9 100644
--- a/freebsd/sys/netinet/ip_gre.c
+++ b/freebsd/sys/netinet/ip_gre.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <net/bpf.h>
diff --git a/freebsd/sys/netinet/ip_icmp.c b/freebsd/sys/netinet/ip_icmp.c
index b6876f7..cd58194 100644
--- a/freebsd/sys/netinet/ip_icmp.c
+++ b/freebsd/sys/netinet/ip_icmp.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
diff --git a/freebsd/sys/netinet/ip_id.c b/freebsd/sys/netinet/ip_id.c
index fd34310..99f829e 100644
--- a/freebsd/sys/netinet/ip_id.c
+++ b/freebsd/sys/netinet/ip_id.c
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <rtems/bsd/sys/types.h>
 #include <sys/malloc.h>
 #include <rtems/bsd/sys/param.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/libkern.h>
 #include <rtems/bsd/sys/lock.h>
diff --git a/freebsd/sys/netinet/ip_input.c b/freebsd/sys/netinet/ip_input.c
index 2247c1a..24002aa 100644
--- a/freebsd/sys/netinet/ip_input.c
+++ b/freebsd/sys/netinet/ip_input.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <rtems/bsd/sys/lock.h>
 #include <sys/rwlock.h>
diff --git a/freebsd/sys/netinet/ip_mroute.c b/freebsd/sys/netinet/ip_mroute.c
index 20daee5..f4aeed2 100644
--- a/freebsd/sys/netinet/ip_mroute.c
+++ b/freebsd/sys/netinet/ip_mroute.c
@@ -94,7 +94,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/netisr.h>
diff --git a/freebsd/sys/netinet/ip_options.c b/freebsd/sys/netinet/ip_options.c
index 98a8a2d..6431aaa 100644
--- a/freebsd/sys/netinet/ip_options.c
+++ b/freebsd/sys/netinet/ip_options.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
diff --git a/freebsd/sys/netinet/ipfw/ip_dn_glue.c b/freebsd/sys/netinet/ipfw/ip_dn_glue.c
index c66f71a..41e75ce 100644
--- a/freebsd/sys/netinet/ipfw/ip_dn_glue.c
+++ b/freebsd/sys/netinet/ipfw/ip_dn_glue.c
@@ -46,7 +46,7 @@
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/taskqueue.h>
 #include <net/if.h>	/* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */
 #include <netinet/in.h>
diff --git a/freebsd/sys/netinet/ipfw/ip_dn_io.c b/freebsd/sys/netinet/ipfw/ip_dn_io.c
index 7cbbb33..4edd968 100644
--- a/freebsd/sys/netinet/ipfw/ip_dn_io.c
+++ b/freebsd/sys/netinet/ipfw/ip_dn_io.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>	/* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */
diff --git a/freebsd/sys/netinet/ipfw/ip_dummynet.c b/freebsd/sys/netinet/ipfw/ip_dummynet.c
index ae657c6..eef5084 100644
--- a/freebsd/sys/netinet/ipfw/ip_dummynet.c
+++ b/freebsd/sys/netinet/ipfw/ip_dummynet.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/taskqueue.h>
 #include <net/if.h>	/* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */
 #include <netinet/in.h>
diff --git a/freebsd/sys/netinet/libalias/alias_db.c b/freebsd/sys/netinet/libalias/alias_db.c
index 28be85d..fabe586 100644
--- a/freebsd/sys/netinet/libalias/alias_db.c
+++ b/freebsd/sys/netinet/libalias/alias_db.c
@@ -157,7 +157,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <stdio.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <unistd.h> 
 #endif
 
diff --git a/freebsd/sys/netinet/libalias/alias_sctp.h b/freebsd/sys/netinet/libalias/alias_sctp.h
index f538d94..ffb0b32 100644
--- a/freebsd/sys/netinet/libalias/alias_sctp.h
+++ b/freebsd/sys/netinet/libalias/alias_sctp.h
@@ -64,7 +64,7 @@
 
 #include <sys/queue.h>
 #include <rtems/bsd/sys/types.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
diff --git a/freebsd/sys/netinet/sctp_header.h b/freebsd/sys/netinet/sctp_header.h
index 261d9eb..8f898a4 100644
--- a/freebsd/sys/netinet/sctp_header.h
+++ b/freebsd/sys/netinet/sctp_header.h
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #ifndef _NETINET_SCTP_HEADER_H_
 #define _NETINET_SCTP_HEADER_H_
 
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <netinet/sctp.h>
 #include <netinet/sctp_constants.h>
 
diff --git a/freebsd/sys/netinet6/dest6.c b/freebsd/sys/netinet6/dest6.c
index 15240df..c8c6f54 100644
--- a/freebsd/sys/netinet6/dest6.c
+++ b/freebsd/sys/netinet6/dest6.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 
 #include <net/if.h>
diff --git a/freebsd/sys/netinet6/frag6.c b/freebsd/sys/netinet6/frag6.c
index 28b2b46..511c860 100644
--- a/freebsd/sys/netinet6/frag6.c
+++ b/freebsd/sys/netinet6/frag6.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 
diff --git a/freebsd/sys/netinet6/icmp6.c b/freebsd/sys/netinet6/icmp6.c
index 49b1bd8..569b5df 100644
--- a/freebsd/sys/netinet6/icmp6.c
+++ b/freebsd/sys/netinet6/icmp6.c
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sx.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/freebsd/sys/netinet6/in6.c b/freebsd/sys/netinet6/in6.c
index 8dc4d29..8487a8c 100644
--- a/freebsd/sys/netinet6/in6.c
+++ b/freebsd/sys/netinet6/in6.c
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 
diff --git a/freebsd/sys/netinet6/in6_pcb.c b/freebsd/sys/netinet6/in6_pcb.c
index 8a7581c..bf69996 100644
--- a/freebsd/sys/netinet6/in6_pcb.c
+++ b/freebsd/sys/netinet6/in6_pcb.c
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/sockio.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/jail.h>
diff --git a/freebsd/sys/netinet6/in6_src.c b/freebsd/sys/netinet6/in6_src.c
index 79beb70..a69ecf2 100644
--- a/freebsd/sys/netinet6/in6_src.c
+++ b/freebsd/sys/netinet6/in6_src.c
@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/sx.h>
diff --git a/freebsd/sys/netinet6/ip6_forward.c b/freebsd/sys/netinet6/ip6_forward.c
index c45ab10..6efae91 100644
--- a/freebsd/sys/netinet6/ip6_forward.c
+++ b/freebsd/sys/netinet6/ip6_forward.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 
diff --git a/freebsd/sys/netinet6/ip6_input.c b/freebsd/sys/netinet6/ip6_input.c
index 17420fa..1053631 100644
--- a/freebsd/sys/netinet6/ip6_input.c
+++ b/freebsd/sys/netinet6/ip6_input.c
@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 
diff --git a/freebsd/sys/netinet6/ip6_mroute.c b/freebsd/sys/netinet6/ip6_mroute.c
index 044b96b..02a9802 100644
--- a/freebsd/sys/netinet6/ip6_mroute.c
+++ b/freebsd/sys/netinet6/ip6_mroute.c
@@ -103,7 +103,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
diff --git a/freebsd/sys/netinet6/nd6.c b/freebsd/sys/netinet6/nd6.c
index 1b855ca..4369eba 100644
--- a/freebsd/sys/netinet6/nd6.c
+++ b/freebsd/sys/netinet6/nd6.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/protosw.h>
 #include <rtems/bsd/sys/errno.h>
diff --git a/freebsd/sys/netinet6/nd6_nbr.c b/freebsd/sys/netinet6/nd6_nbr.c
index ce26d54..cb76554 100644
--- a/freebsd/sys/netinet6/nd6_nbr.c
+++ b/freebsd/sys/netinet6/nd6_nbr.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <rtems/bsd/sys/errno.h>
 #include <sys/syslog.h>
diff --git a/freebsd/sys/netinet6/nd6_rtr.c b/freebsd/sys/netinet6/nd6_rtr.c
index 030cac3..8d150ae 100644
--- a/freebsd/sys/netinet6/nd6_rtr.c
+++ b/freebsd/sys/netinet6/nd6_rtr.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <rtems/bsd/sys/lock.h>
 #include <rtems/bsd/sys/errno.h>
diff --git a/freebsd/sys/netipsec/ipsec.c b/freebsd/sys/netipsec/ipsec.c
index 853292c..e5002d8 100644
--- a/freebsd/sys/netipsec/ipsec.c
+++ b/freebsd/sys/netipsec/ipsec.c
@@ -50,7 +50,7 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_dn_glue.c b/freebsd/sys/netpfil/ipfw/ip_dn_glue.c
index 92da3b1..8e0cc36 100644
--- a/freebsd/sys/netpfil/ipfw/ip_dn_glue.c
+++ b/freebsd/sys/netpfil/ipfw/ip_dn_glue.c
@@ -46,7 +46,7 @@
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/taskqueue.h>
 #include <net/if.h>	/* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */
 #include <netinet/in.h>
diff --git a/freebsd/sys/netpfil/ipfw/ip_dn_io.c b/freebsd/sys/netpfil/ipfw/ip_dn_io.c
index 6aaf73c..23392a5 100644
--- a/freebsd/sys/netpfil/ipfw/ip_dn_io.c
+++ b/freebsd/sys/netpfil/ipfw/ip_dn_io.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/socket.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>	/* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */
diff --git a/freebsd/sys/netpfil/ipfw/ip_dummynet.c b/freebsd/sys/netpfil/ipfw/ip_dummynet.c
index bb9a673..40c37d8 100644
--- a/freebsd/sys/netpfil/ipfw/ip_dummynet.c
+++ b/freebsd/sys/netpfil/ipfw/ip_dummynet.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/taskqueue.h>
 #include <net/if.h>	/* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */
 #include <netinet/in.h>
diff --git a/freebsd/sys/opencrypto/xform.c b/freebsd/sys/opencrypto/xform.c
index 2e66d28..1227ad2 100644
--- a/freebsd/sys/opencrypto/xform.c
+++ b/freebsd/sys/opencrypto/xform.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/kernel.h>
 #include <machine/cpu.h>
 
diff --git a/freebsd/sys/rpc/types.h b/freebsd/sys/rpc/types.h
index 754d627..5dbaae8 100644
--- a/freebsd/sys/rpc/types.h
+++ b/freebsd/sys/rpc/types.h
@@ -71,7 +71,7 @@ MALLOC_DECLARE(M_RPC);
 #define mem_free(ptr, bsize)	free(ptr)
 #endif
 
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #ifdef _KERNEL
 #include <rpc/netconfig.h>
 #else
diff --git a/freebsd/sys/sys/proc.h b/freebsd/sys/sys/proc.h
index c393e71..1593eb2 100644
--- a/freebsd/sys/sys/proc.h
+++ b/freebsd/sys/sys/proc.h
@@ -57,7 +57,7 @@
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #ifndef _KERNEL
-#include <rtems/bsd/sys/time.h>			/* For structs itimerval, timeval. */
+#include <sys/time.h>			/* For structs itimerval, timeval. */
 #else
 #include <sys/pcpu.h>
 #endif
diff --git a/freebsd/sys/sys/user.h b/freebsd/sys/sys/user.h
index dc59439..698cad9 100644
--- a/freebsd/sys/sys/user.h
+++ b/freebsd/sys/sys/user.h
@@ -39,7 +39,7 @@
 #ifndef _KERNEL
 /* stuff that *used* to be included by user.h, or is now needed */
 #include <rtems/bsd/sys/errno.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <rtems/bsd/sys/resource.h>
 #include <sys/ucred.h>
 #include <sys/uio.h>
diff --git a/freebsd/usr.bin/netstat/if.c b/freebsd/usr.bin/netstat/if.c
index b026cb4..cc5ecaa 100644
--- a/freebsd/usr.bin/netstat/if.c
+++ b/freebsd/usr.bin/netstat/if.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
diff --git a/freebsd/usr.bin/netstat/mroute.c b/freebsd/usr.bin/netstat/mroute.c
index 21ba22f..7a860cd 100644
--- a/freebsd/usr.bin/netstat/mroute.c
+++ b/freebsd/usr.bin/netstat/mroute.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/protosw.h>
 #include <sys/mbuf.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/freebsd/usr.bin/netstat/mroute6.c b/freebsd/usr.bin/netstat/mroute6.c
index 20a9d08..3a5b25b 100644
--- a/freebsd/usr.bin/netstat/mroute6.c
+++ b/freebsd/usr.bin/netstat/mroute6.c
@@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/protosw.h>
 #include <sys/mbuf.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
diff --git a/freebsd/usr.bin/netstat/route.c b/freebsd/usr.bin/netstat/route.c
index 3fc7f92..afa55ce 100644
--- a/freebsd/usr.bin/netstat/route.c
+++ b/freebsd/usr.bin/netstat/route.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/rtemsbsd/include/rtems/bsd/sys/param.h b/rtemsbsd/include/rtems/bsd/sys/param.h
index 2945691..d301957 100644
--- a/rtemsbsd/include/rtems/bsd/sys/param.h
+++ b/rtemsbsd/include/rtems/bsd/sys/param.h
@@ -97,7 +97,7 @@
 #include <sys/cdefs.h>
 #include <rtems/bsd/sys/errno.h>
 #ifndef LOCORE
-#include <rtems/bsd/sys/time.h>
+#include <sys/time.h>
 #include <sys/priority.h>
 #endif
 
diff --git a/rtemsbsd/include/rtems/bsd/sys/time.h b/rtemsbsd/include/rtems/bsd/sys/time.h
deleted file mode 100644
index a09e376..0000000
--- a/rtemsbsd/include/rtems/bsd/sys/time.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2009-2015 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _RTEMS_BSD_SYS_TIME_H_
-#define _RTEMS_BSD_SYS_TIME_H_
-
-#include <sys/time.h>
-#include <rtems/timecounter.h>
-
-#define bintime(_x) _Timecounter_Bintime(_x)
-#define nanotime(_x) _Timecounter_Nanotime(_x)
-#define microtime(_x) _Timecounter_Microtime(_x)
-#define binuptime(_x) _Timecounter_Binuptime(_x)
-#define nanouptime(_x) _Timecounter_Nanouptime(_x)
-#define microuptime(_x) _Timecounter_Microuptime(_x)
-#define getbintime(_x) _Timecounter_Getbintime(_x)
-#define getnanotime(_x) _Timecounter_Getnanotime(_x)
-#define getmicrotime(_x) _Timecounter_Getmicrotime(_x)
-#define getbinuptime(_x) _Timecounter_Getbinuptime(_x)
-#define getnanouptime(_x) _Timecounter_Getnanouptime(_x)
-#define getmicrouptime(_x) _Timecounter_Getmicrouptime(_x)
-#define boottimebin _Timecounter_Boottimebin
-#define time_second _Timecounter_Time_second
-#define time_uptime _Timecounter_Time_uptime
-
-#endif /* _RTEMS_BSD_SYS_TIME_H_ */



More information about the vc mailing list