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.

6 files changed, 21 insertions, 21 deletions

diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index a744dc8..e10f9a1 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -33,7 +33,7 @@
  * Thanks to David Campbell work on the Linux driver and the Iomega specs
  * Thanks to Thiebault Moeglin for the drive
  */
-#ifdef KERNEL
+#ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -41,11 +41,11 @@
 
 #include <machine/clock.h>
 
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 #include <sys/kernel.h>
-#endif /*KERNEL */
+#endif /* _KERNEL */
 
 #include "opt_vpo.h"
 
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 7d4ba59..b98f80e2 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -103,14 +103,14 @@ static int			lpbb_ppb_attach(struct ppb_device *dev);
 static struct lpbb_softc *lpbbdata[MAXLPBB];
 static int nlpbb = 0;
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 static struct ppb_driver lpbbdriver = {
     lpbb_ppb_probe, lpbb_ppb_attach, "lpbb"
 };
 DATA_SET(ppbdriver_set, lpbbdriver);
 
-#endif /* KERNEL */
+#endif
 
 static int
 lpbb_probe(device_t dev)
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 7120321..531ad48 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -62,7 +62,7 @@
  */
 
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -75,7 +75,7 @@
 
 #include <machine/clock.h>
 #include <machine/lpt.h>
-#endif /*KERNEL*/
+#endif
 
 #include <dev/ppbus/ppbconf.h>
 #include <dev/ppbus/ppb_1284.h>
@@ -154,14 +154,14 @@ static void			lptintr(int unit);
 
 static void			lpt_intr(int unit);	/* without spls */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 static struct ppb_driver lptdriver = {
     lptprobe, lptattach, LPT_NAME
 };
 DATA_SET(ppbdriver_set, lptdriver);
 
-#endif /* KERNEL */
+#endif
 
 /* bits for state */
 #define	OPEN		(1<<0)	/* device is open */
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 7d854e3..8ff2fb4 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.h
@@ -29,7 +29,7 @@
 #ifndef __PPI_H
 #define __PPI_H
 
-#ifndef KERNEL
+#ifndef _KERNEL
 # include <sys/types.h>
 #endif
 #include <sys/ioccom.h>
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index a6801f2..23e6058 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -27,7 +27,7 @@
  *
  */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -35,7 +35,7 @@
 
 #include <machine/clock.h>
 
-#endif	/* KERNEL */
+#endif	/* _KERNEL */
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
@@ -47,9 +47,9 @@
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_da.h>
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 #include <sys/kernel.h>
-#endif /*KERNEL */
+#endif
 
 #include "opt_vpo.h"
 
@@ -87,7 +87,7 @@ static int	nvpo = 0;
 #define MAXVP0	8			/* XXX not much better! */
 static struct vpo_data *vpodata[MAXVP0];
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 /*
  * Make ourselves visible as a ppbus driver
@@ -100,7 +100,7 @@ static struct ppb_driver vpodriver = {
 };
 DATA_SET(ppbdriver_set, vpodriver);
 
-#endif /* KERNEL */
+#endif
 
 /*
  * vpoprobe()
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index b158229..73e4adb 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -27,7 +27,7 @@
  *
  */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -35,11 +35,11 @@
 
 #include <machine/clock.h>
 
-#endif	/* KERNEL */
+#endif
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 #include <sys/kernel.h>
-#endif /*KERNEL */
+#endif
 
 #include "opt_vpo.h"