Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL"

is an application space macro and the applications are supposed to be free
to use it as they please (but cannot).  This is consistant with the other
BSD's who made this change quite some time ago.  More commits to come.

15 files changed, 31 insertions, 31 deletions

diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 0409efe2d817..9f56150c183f 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -92,7 +92,7 @@ struct iso_node {
 #define VTOI(vp) ((struct iso_node *)(vp)->v_data)
 #define ITOV(ip) ((ip)->i_vnode)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_ISOFSMNT);
@@ -123,4 +123,4 @@ void cd9660_ihashins __P((struct iso_node *));
 int cd9660_tstamp_conv7 __P((u_char *, struct timespec *, enum ISO_FTYPE));
 int cd9660_tstamp_conv17 __P((u_char *, struct timespec *));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 6a685d2465e9..f9a4abbc6008 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -213,7 +213,7 @@ struct iso_extended_attributes {
 	u_char len_au			[ISODCL (247, 250)]; /* 723 */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 /* CD-ROM Format type */
 enum ISO_FTYPE	{ ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP,
@@ -270,7 +270,7 @@ int isofncmp __P((u_char *, int, u_char *, int, int));
 void isofntrans __P((u_char *, int, u_char *, u_short *, int, int, int));
 ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 /*
  * The isonum_xxx functions are inlined anyway, and could come handy even
diff --git a/sys/fs/coda/coda.h b/sys/fs/coda/coda.h
index 5a25bc67f152..2e59cfcf7d21 100644
--- a/sys/fs/coda/coda.h
+++ b/sys/fs/coda/coda.h
@@ -53,7 +53,7 @@
 #endif
 
 #if defined(DJGPP) || defined(__CYGWIN32__)
-#ifdef KERNEL
+#ifdef _KERNEL
 typedef unsigned long u_long;
 typedef unsigned int u_int;
 typedef unsigned short u_short;
@@ -72,11 +72,11 @@ struct timespec {
         long       ts_sec;
         long       ts_nsec;
 };
-#else  /* DJGPP but not KERNEL */
+#else  /* DJGPP but not _KERNEL */
 #include <sys/types.h>
 #include <sys/time.h>
 typedef unsigned long long u_quad_t;
-#endif /* !KERNEL */
+#endif /* !_KERNEL */
 #endif /* !DJGPP */
 
 
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index 463e52836918..755149d2a46c 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -38,7 +38,7 @@
  * $FreeBSD$
  */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 struct fdescmount {
 	struct vnode	*f_root;	/* Root node */
 };
@@ -76,4 +76,4 @@ extern dev_t devctty;
 extern int fdesc_init __P((struct vfsconf *));
 extern int fdesc_root __P((struct mount *, struct vnode **));
 extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index 49eac87a2075..f57e014ef1df 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -212,7 +212,7 @@ struct denode {
 #define	de_forw		de_chain[0]
 #define	de_back		de_chain[1]
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #define	VTODE(vp)	((struct denode *)(vp)->v_data)
 #define	DETOV(de)	((de)->de_vnode)
@@ -283,4 +283,4 @@ int deupdat __P((struct denode *dep, int waitfor));
 int removede __P((struct denode *pdep, struct denode *dep));
 int detrunc __P((struct denode *dep, u_long length, int flags, struct ucred *cred, struct proc *p));
 int doscheckpath __P(( struct denode *source, struct denode *target));
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index 3225b78b8936..fccf58b53ff3 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -127,7 +127,7 @@ struct winentry {
 #define DD_YEAR_MASK		0xFE00	/* year - 1980 */
 #define DD_YEAR_SHIFT		9
 
-#ifdef KERNEL
+#ifdef _KERNEL
 struct dirent;
 void unix2dostime __P((struct timespec *tsp, u_int16_t *ddp, 
 	     u_int16_t *dtp, u_int8_t *dhp));
@@ -140,4 +140,4 @@ int win2unixfn __P((struct winentry *wep, struct dirent *dp, int chksum, int tab
 u_int8_t winChksum __P((u_int8_t *name));
 int winSlotCnt __P((const u_char *un, int unlen));
 int winLenFixup __P((const u_char *un, int unlen));
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index 9f20cbae4199..7dd5bbfffd74 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -83,7 +83,7 @@
 
 #define	MSDOSFSEOF(pmp, cn)	((((cn) | ~(pmp)->pm_fatmask) & CLUST_EOFS) == CLUST_EOFS)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * These are the values for the function argument to the function
  * fatentry().
@@ -105,4 +105,4 @@ int freeclusterchain __P((struct msdosfsmount *pmp, u_long startchain));
 int extendfile __P((struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags));
 void fc_purge __P((struct denode *dep, u_int frcn));
 
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index a8c2e5bbc6b2..4b6ade179e41 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -51,7 +51,7 @@
 #ifndef _MSDOSFS_MSDOSFSMOUNT_H_
 #define	_MSDOSFS_MSDOSFSMOUNT_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_MSDOSFSMNT);
@@ -193,7 +193,7 @@ struct msdosfsmount {
 int msdosfs_init __P((struct vfsconf *vfsp));
 int msdosfs_mountroot __P((void));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 /*
  *  Arguments to mount MSDOS filesystems.
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index fcd179e73afb..2b7ed51d2427 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -47,7 +47,7 @@ struct null_mount {
 	struct vnode	*nullm_rootvp;	/* Reference to root null_node */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * A cache of vnode references
  */
@@ -73,4 +73,4 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
 extern int	null_bypass __P((struct vop_generic_args *ap));
 
 extern vop_t **null_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/nwfs/nwfs.h b/sys/fs/nwfs/nwfs.h
index 51ae76b3b1a8..e5478692b13e 100644
--- a/sys/fs/nwfs/nwfs.h
+++ b/sys/fs/nwfs/nwfs.h
@@ -49,7 +49,7 @@
 #define	NWFSIOC_GETEINFO	_IOR('n',2,struct nw_entry_info)
 #define	NWFSIOC_GETNS		_IOR('n',3,int)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -78,6 +78,6 @@ int nwfs_ioctl(struct vop_ioctl_args *ap);
 int nwfs_doio(struct buf *bp, struct ucred *cr, struct proc *p);
 int nwfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred, 
 	struct proc *p, int intrflg);
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
 
 #endif /* _NWFS_H_ */
diff --git a/sys/fs/nwfs/nwfs_mount.h b/sys/fs/nwfs/nwfs_mount.h
index 02702eda5e6e..613e6856fe35 100644
--- a/sys/fs/nwfs/nwfs_mount.h
+++ b/sys/fs/nwfs/nwfs_mount.h
@@ -70,11 +70,11 @@ struct nwfs_args {
 	struct ncp_nlstables nls;
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_NWFSMNT);
 #endif
 
-#endif /* KERNEL */
+#endif
 #endif /* !_NWFS_MOUNT_H_ */
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index 6e781455d75b..ec46662afd76 100644
--- a/sys/fs/portalfs/portal.h
+++ b/sys/fs/portalfs/portal.h
@@ -50,7 +50,7 @@ struct portal_cred {
 	gid_t		pcr_groups[NGROUPS];	/* From ucred */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 struct portalmount {
 	struct vnode	*pm_root;	/* Root node */
 	struct file	*pm_server;	/* Held reference to server socket */
@@ -68,4 +68,4 @@ struct portalnode {
 #define PORTAL_ROOTFILEID	2
 
 extern vop_t **portal_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 1402a7c82f2c..f0000267b5d7 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -83,7 +83,7 @@ struct pfsnode {
 /*
  * Kernel stuff follows
  */
-#ifdef KERNEL
+#ifdef _KERNEL
 #define CNEQ(cnp, s, len) \
 	 ((cnp)->cn_namelen == (len) && \
 	  (bcmp((s), (cnp)->cn_nameptr, (len)) == 0))
@@ -159,4 +159,4 @@ extern vop_t **procfs_vnodeop_p;
 
 int	procfs_root __P((struct mount *, struct vnode **));
 int	procfs_rw __P((struct vop_read_args *));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 856aeb9365e9..eb562eda6722 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -62,7 +62,7 @@ struct umap_mount {
 	    group mapping in ficus */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * A cache of vnode references
  */
@@ -88,4 +88,4 @@ extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
 #endif
 
 extern vop_t **umap_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index 3fb0b6e7e837..a720d411df87 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -56,7 +56,7 @@ struct union_mount {
 	int		um_op;		/* Operation mode */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifndef DIAGNOSTIC
 #define DIAGNOSTIC
@@ -152,4 +152,4 @@ extern vop_t **union_vnodeop_p;
 extern struct vfsops union_vfsops;
 extern int uniondebug;
 
-#endif /* KERNEL */
+#endif /* _KERNEL */