[src/trunk]: src/sys/sys protect more kernel stuff.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0fa986bc3a5f
branches:  trunk
changeset: 813283:0fa986bc3a5f
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 23 16:02:09 2016 +0000

description:
protect more kernel stuff.

diffstat:

 sys/sys/vnode.h |  6 +++++-
 sys/sys/wapbl.h |  4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r bc681c2ce9f9 -r 0fa986bc3a5f sys/sys/vnode.h
--- a/sys/sys/vnode.h   Sat Jan 23 15:45:42 2016 +0000
+++ b/sys/sys/vnode.h   Sat Jan 23 16:02:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vnode.h,v 1.257 2016/01/22 22:43:25 dholland Exp $     */
+/*     $NetBSD: vnode.h,v 1.258 2016/01/23 16:02:09 christos Exp $     */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -68,6 +68,7 @@
 #include <sys/time.h>
 
 /* XXX: clean up includes later */
+#if defined(_KERNEL) || defined(_KMEMUSER)
 #include <uvm/uvm_param.h>     /* XXX */
 #include <uvm/uvm_pglist.h>    /* XXX */
 #include <uvm/uvm_object.h>    /* XXX */
@@ -75,6 +76,7 @@
 
 struct namecache;
 struct uvm_ractx;
+#endif
 
 /*
  * The vnode is the focus of all file activity in UNIX.  There is a
@@ -112,6 +114,7 @@
     "VT_TMPFS", "VT_UDF", "VT_SYSVBFS", "VT_PUFFS", "VT_HFS", "VT_EFS", \
     "VT_ZFS", "VT_RUMP", "VT_NILFS", "VT_V7FS", "VT_CHFS"
 
+#if defined(_KERNEL) || defined(_KMEMUSER)
 struct vnode;
 struct buf;
 
@@ -180,6 +183,7 @@
 
 typedef struct vnodelst vnodelst_t;
 typedef struct vnode vnode_t;
+#endif
 
 /*
  * Vnode flags.  The first set are locked by vnode lock or are stable.
diff -r bc681c2ce9f9 -r 0fa986bc3a5f sys/sys/wapbl.h
--- a/sys/sys/wapbl.h   Sat Jan 23 15:45:42 2016 +0000
+++ b/sys/sys/wapbl.h   Sat Jan 23 16:02:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wapbl.h,v 1.16 2014/09/05 05:42:50 matt Exp $  */
+/*     $NetBSD: wapbl.h,v 1.17 2016/01/23 16:02:09 christos Exp $      */
 
 /*-
  * Copyright (c) 2003,2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,9 @@
 
 #include <sys/mutex.h>
 
+#if defined(_KERNEL) || defined(_KMEMUSER)
 #include <miscfs/specfs/specdev.h>
+#endif
 
 /* This header file describes the api and data structures for
  * write ahead physical block logging (WAPBL) support.