Update to FreeBSD head 2018-02-01

Git mirror commit d079ae0442af8fa3cfd6d7ede190d04e64a2c0d4.

Update #3472.

4 files changed, 51 insertions, 2 deletions

diff --git a/rtemsbsd/include/machine/_limits.h b/rtemsbsd/include/machine/_limits.h
index c7187c60..18383c33 100644
--- a/rtemsbsd/include/machine/_limits.h
+++ b/rtemsbsd/include/machine/_limits.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2009-2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2009, 2018 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -46,4 +46,6 @@
 
 #define __INT_MAX INT_MAX
 
+#define __SIZE_T_MAX __SIZE_MAX__
+
 #endif /* _RTEMS_BSD_MACHINE__LIMITS_H_ */
diff --git a/rtemsbsd/include/machine/atomic.h b/rtemsbsd/include/machine/atomic.h
index b95a4b5a..f7de4178 100644
--- a/rtemsbsd/include/machine/atomic.h
+++ b/rtemsbsd/include/machine/atomic.h
@@ -492,6 +492,27 @@ atomic_readandclear_int(volatile int *p)
 }
 
 static inline int
+atomic_load_int(volatile int *p)
+{
+	int tmp;
+
+#if defined(_RTEMS_BSD_MACHINE_ATOMIC_USE_ATOMIC)
+	std::atomic_int *q =
+	    reinterpret_cast<std::atomic_int *>(const_cast<int *>(p));
+
+	tmp = q->load(std::memory_order_relaxed);
+#elif defined(_RTEMS_BSD_MACHINE_ATOMIC_USE_STDATOMIC)
+	atomic_int *q = (atomic_int *)RTEMS_DEVOLATILE(int *, p);
+
+	tmp = atomic_load_explicit(q, memory_order_relaxed);
+#else
+	tmp = *p;
+#endif
+
+	return (tmp);
+}
+
+static inline int
 atomic_load_acq_int(volatile int *p)
 {
 	int tmp;
@@ -514,6 +535,23 @@ atomic_load_acq_int(volatile int *p)
 }
 
 static inline void
+atomic_store_int(volatile int *p, int v)
+{
+#if defined(_RTEMS_BSD_MACHINE_ATOMIC_USE_ATOMIC)
+	std::atomic_int *q =
+	    reinterpret_cast<std::atomic_int *>(const_cast<int *>(p));
+
+	q->store(v, std::memory_order_relaxed);
+#elif defined(_RTEMS_BSD_MACHINE_ATOMIC_USE_STDATOMIC)
+	atomic_int *q = (atomic_int *)RTEMS_DEVOLATILE(int *, p);
+
+	atomic_store_explicit(q, v, memory_order_relaxed);
+#else
+	*p = v;
+#endif
+}
+
+static inline void
 atomic_store_rel_int(volatile int *p, int v)
 {
 #if defined(_RTEMS_BSD_MACHINE_ATOMIC_USE_ATOMIC)
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
index dd0b2ed2..3bdb6916 100644
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
@@ -1744,6 +1744,7 @@
 #define	ieee80211_wme_initparams _bsd_ieee80211_wme_initparams
 #define	ieee80211_wme_updateparams _bsd_ieee80211_wme_updateparams
 #define	ieee80211_wme_updateparams_locked _bsd_ieee80211_wme_updateparams_locked
+#define	ieee80211_wme_vap_ac_is_noack _bsd_ieee80211_wme_vap_ac_is_noack
 #define	ieee80211_wme_vap_getparams _bsd_ieee80211_wme_vap_getparams
 #define	ifa_add_loopback_route _bsd_ifa_add_loopback_route
 #define	ifa_alloc _bsd_ifa_alloc
@@ -2594,6 +2595,7 @@
 #define	make_dev_args_init_impl _bsd_make_dev_args_init_impl
 #define	make_dev_s _bsd_make_dev_s
 #define	M_ALIAS _bsd_M_ALIAS
+#define	mallocarray _bsd_mallocarray
 #define	malloc_init _bsd_malloc_init
 #define	malloc_uninit _bsd_malloc_uninit
 #define	m_append _bsd_m_append
@@ -3207,6 +3209,7 @@
 #define	pf_pull_hdr _bsd_pf_pull_hdr
 #define	pf_purge_expired_fragments _bsd_pf_purge_expired_fragments
 #define	pf_purge_expired_src_nodes _bsd_pf_purge_expired_src_nodes
+#define	pf_purge_fragments _bsd_pf_purge_fragments
 #define	pf_purge_proc _bsd_pf_purge_proc
 #define	pf_purge_thread _bsd_pf_purge_thread
 #define	pf_qids _bsd_pf_qids
@@ -4043,7 +4046,6 @@
 #define	sctp_deact_sharedkey_ep _bsd_sctp_deact_sharedkey_ep
 #define	sctp_default_supported_hmaclist _bsd_sctp_default_supported_hmaclist
 #define	sctp_del_addr_from_vrf _bsd_sctp_del_addr_from_vrf
-#define	sctp_delayed_cksum _bsd_sctp_delayed_cksum
 #define	sctp_delete_from_timewait _bsd_sctp_delete_from_timewait
 #define	sctp_delete_prim_timer _bsd_sctp_delete_prim_timer
 #define	sctp_delete_sharedkey _bsd_sctp_delete_sharedkey
@@ -4654,6 +4656,7 @@
 #define	tcp6_usrreqs _bsd_tcp6_usrreqs
 #define	tcp_abc_l_var _bsd_tcp_abc_l_var
 #define	tcp_addoptions _bsd_tcp_addoptions
+#define	tcp_always_keepalive _bsd_tcp_always_keepalive
 #define	tcp_autorcvbuf _bsd_tcp_autorcvbuf
 #define	tcp_autorcvbuf_inc _bsd_tcp_autorcvbuf_inc
 #define	tcp_autorcvbuf_max _bsd_tcp_autorcvbuf_max
@@ -4770,6 +4773,7 @@
 #define	tcp_sendspace _bsd_tcp_sendspace
 #define	tcp_setpersist _bsd_tcp_setpersist
 #define	tcp_slowtimo _bsd_tcp_slowtimo
+#define	tcp_sndbuf_autoscale _bsd_tcp_sndbuf_autoscale
 #define	tcps_states _bsd_tcps_states
 #define	tcpstat _bsd_tcpstat
 #define	tcp_state_change _bsd_tcp_state_change
@@ -4963,6 +4967,7 @@
 #define	ulitecb _bsd_ulitecb
 #define	ulitecbinfo _bsd_ulitecbinfo
 #define	uma_align_cache _bsd_uma_align_cache
+#define	uma_avail _bsd_uma_avail
 #define	uma_limit _bsd_uma_limit
 #define	uma_print_stats _bsd_uma_print_stats
 #define	uma_print_zone _bsd_uma_print_zone
@@ -4974,10 +4979,12 @@
 #define	uma_size _bsd_uma_size
 #define	uma_startup _bsd_uma_startup
 #define	uma_zalloc_arg _bsd_uma_zalloc_arg
+#define	uma_zalloc_domain _bsd_uma_zalloc_domain
 #define	uma_zcache_create _bsd_uma_zcache_create
 #define	uma_zcreate _bsd_uma_zcreate
 #define	uma_zdestroy _bsd_uma_zdestroy
 #define	uma_zfree_arg _bsd_uma_zfree_arg
+#define	uma_zfree_domain _bsd_uma_zfree_domain
 #define	uma_zone_exhausted _bsd_uma_zone_exhausted
 #define	uma_zone_exhausted_nolock _bsd_uma_zone_exhausted_nolock
 #define	uma_zone_get_cur _bsd_uma_zone_get_cur
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h
index bfdc27ec..b22d73e2 100644
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-space.h
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-space.h
@@ -92,4 +92,6 @@ void rtems_bsd_assert_func(const char *file, int line, const char *func, const c
 #define	ENOIOCTL	(-3)		/* ioctl not handled by this layer */
 #define	EDIRIOCTL	(-4)		/* do direct ioctl in GEOM */
 
+#define	EDOOFUS __ELASTERROR
+
 #endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_KERNEL_SPACE_H_ */