Index: conf/files
===================================================================
RCS file: /cvs/src/sys/conf/files,v
retrieving revision 1.630
diff -u -p -r1.630 files
--- conf/files	9 Sep 2016 04:50:54 -0000	1.630
+++ conf/files	14 Sep 2016 00:51:11 -0000
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.630 2016/09/09 04:50:54 dlg Exp $
+#	$OpenBSD: files,v 1.629 2016/09/06 19:48:44 tedu Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -692,6 +692,7 @@ file kern/subr_hibernate.c		hibernate
 file kern/subr_log.c
 file kern/subr_poison.c			diagnostic
 file kern/subr_pool.c
+file kern/subr_tree.c
 file kern/dma_alloc.c
 file kern/subr_prf.c
 file kern/subr_prof.c
Index: sys/tree.h
===================================================================
RCS file: /cvs/src/sys/sys/tree.h,v
retrieving revision 1.21
diff -u -p -r1.21 tree.h
--- sys/tree.h	9 Sep 2016 20:31:46 -0000	1.21
+++ sys/tree.h	14 Sep 2016 00:51:12 -0000
@@ -764,8 +764,6 @@ name##_RB_MINMAX(struct name *head, int 
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if 0
-
 struct rb_type {
 	int		(*t_compare)(const void *, const void *);
 	void		(*t_augment)(void *);
@@ -790,6 +788,8 @@ struct _name {								\
 
 #define RBT_ENTRY(_type)	struct rb_entry
 
+#ifdef _KERNEL
+
 static inline void
 _rb_init(struct rb_tree *rbt)
 {
@@ -966,6 +966,6 @@ RBT_GENERATE_INTERNAL(_name, _type, _fie
 	     (_e) != NULL && ((_n) = RBT_PREV(_name, (_e)), 1);	\
 	     (_e) = (_n))
 
-#endif /* 0 */
+#endif /* _KERNEL */
 
 #endif	/* _SYS_TREE_H_ */