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.

5 files changed, 17 insertions, 17 deletions

diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 75a3982..2d009a1 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -40,7 +40,7 @@
 #ifndef _NFS_NFS_H_
 #define _NFS_NFS_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include "opt_nfs.h"
 #endif
 
@@ -83,7 +83,7 @@
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
 #endif
 #define	NFS_DIRBLKSIZ	4096		/* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
 #define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
 #endif
 
@@ -299,7 +299,7 @@ struct nfsstats {
 		       { "nfsprivport", CTLTYPE_INT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int	nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 			 struct proc *procp, struct mbuf **mrq));
 void	nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
 void	nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
 
 #endif
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 75a3982..2d009a1 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -40,7 +40,7 @@
 #ifndef _NFS_NFS_H_
 #define _NFS_NFS_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include "opt_nfs.h"
 #endif
 
@@ -83,7 +83,7 @@
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
 #endif
 #define	NFS_DIRBLKSIZ	4096		/* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
 #define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
 #endif
 
@@ -299,7 +299,7 @@ struct nfsstats {
 		       { "nfsprivport", CTLTYPE_INT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int	nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 			 struct proc *procp, struct mbuf **mrq));
 void	nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
 void	nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
 
 #endif
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index 77ac7e3..8efd1df 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -95,12 +95,12 @@ struct	nfsmount {
 	u_int64_t nm_maxfilesize;	/* maximum file size */
 };
 
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
 /*
  * Convert mount ptr to nfsmount ptr.
  */
 #define VFSTONFS(mp)	((struct nfsmount *)((mp)->mnt_data))
 
-#endif /* KERNEL */
+#endif
 
 #endif
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index e654bc0..dac6020 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -41,7 +41,7 @@
 #ifndef _NFS_NFSNODE_H_
 #define _NFS_NFSNODE_H_
 
-#if !defined(_NFS_NFS_H_) && !defined(KERNEL)
+#if !defined(_NFS_NFS_H_) && !defined(_KERNEL)
 #include <nfs/nfs.h>
 #endif
 
@@ -157,7 +157,7 @@ extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
 extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
 extern struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON];
 
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
 
 /*
  *	nfs_rslock -	Attempt to obtain lock on nfsnode
@@ -205,6 +205,6 @@ void nfs_invaldir __P((struct vnode *));
 
 #define nqnfs_lease_updatetime	nfs_lease_updatetime
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 75a3982..2d009a1 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -40,7 +40,7 @@
 #ifndef _NFS_NFS_H_
 #define _NFS_NFS_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include "opt_nfs.h"
 #endif
 
@@ -83,7 +83,7 @@
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
 #endif
 #define	NFS_DIRBLKSIZ	4096		/* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
 #define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
 #endif
 
@@ -299,7 +299,7 @@ struct nfsstats {
 		       { "nfsprivport", CTLTYPE_INT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int	nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 			 struct proc *procp, struct mbuf **mrq));
 void	nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
 void	nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
 
 #endif