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, 15 insertions, 14 deletions

diff --git a/sys/i386/isa/atapi.h b/sys/i386/isa/atapi.h
index afa76ea..c57b41d 100644
--- a/sys/i386/isa/atapi.h
+++ b/sys/i386/isa/atapi.h
@@ -12,6 +12,7 @@
  * all derivative works or modified versions.
  *
  * Version 1.9, Thu Oct 12 15:53:50 MSK 1995
+ * $FreeBSD$
  */
 
 /*
@@ -261,7 +262,7 @@ struct atapi {                          /* ATAPI controller data */
 	struct atapicmd  cmdrq[16];     /* pool of command requests */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 struct atapi;
 
 extern struct atapidrv atapi_drvtab[4]; /* delayed attach info */
diff --git a/sys/i386/isa/intr_machdep.h b/sys/i386/isa/intr_machdep.h
index cf0667c..cc6ca67 100644
--- a/sys/i386/isa/intr_machdep.h
+++ b/sys/i386/isa/intr_machdep.h
@@ -40,7 +40,7 @@
  * Low level interrupt code.
  */ 
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #if defined(SMP) || defined(APIC_IO)
 /*
@@ -208,6 +208,6 @@ int inthand_remove(struct intrec *idesc);
 
 #endif /* LOCORE */
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_I386_ISA_INTR_MACHDEP_H_ */
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 2008c62..9debeb0 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -37,7 +37,7 @@
 #ifndef _I386_ISA_ISA_DEVICE_H_
 #define	_I386_ISA_ISA_DEVICE_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #ifndef _ISA_ISAVAR_H_
 #include <i386/isa/isa_dma.h>
 #endif
@@ -98,12 +98,12 @@ struct isa_driver {
 	int	sensitive_hw;		/* true if other probes confuse us */
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 int	haveseen_iobase __P((struct isa_device *dvp, int iosize));
 void	reconfig_isadev __P((struct isa_device *isdp, u_int *mp));
 int	isa_compat_nextid __P((void));
 
-#endif /* KERNEL */
+#endif
 
 #endif /* !_I386_ISA_ISA_DEVICE_H_ */
diff --git a/sys/i386/isa/isa_dma.h b/sys/i386/isa/isa_dma.h
index 15f8b3d..7f9396a 100644
--- a/sys/i386/isa/isa_dma.h
+++ b/sys/i386/isa/isa_dma.h
@@ -37,7 +37,7 @@
 #ifndef _I386_ISA_ISA_DMA_H_
 #define	_I386_ISA_ISA_DMA_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 void	isa_dmacascade __P((int chan));
 void	isa_dmadone __P((int flags, caddr_t addr, int nbytes, int chan));
 void	isa_dmainit __P((int chan, u_int bouncebufsize));
@@ -46,6 +46,6 @@ int	isa_dma_acquire __P((int chan));
 void	isa_dma_release __P((int chan));
 int	isa_dmastatus __P((int chan));
 int	isa_dmastop __P((int chan));
-#endif /* KERNEL */
+#endif
 
 #endif /* !_I386_ISA_ISA_DMA_H_ */
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index be45150..7964c6a 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -20,7 +20,7 @@
  *
  */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
@@ -30,7 +30,7 @@
 #include <sys/malloc.h>
 
 #include <i386/isa/isa_device.h>
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 typedef TAILQ_HEAD(, datapoint) dphead_t;
 
@@ -95,7 +95,7 @@ struct datapoint {
 
 #define PGUARD 990             /* program guard time (cycle) (990!) */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #define NLORAN	10		/* Allow ten minor devices */
 
@@ -642,4 +642,4 @@ static struct cdevsw loran_cdevsw = {
 	/* bmaj */	-1
 };
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h
index f19867a..7dc9a87 100644
--- a/sys/i386/isa/wdreg.h
+++ b/sys/i386/isa/wdreg.h
@@ -143,7 +143,7 @@
 #define	WDSD_IBM	0xa0		/* forced to 512 byte sector, ecc */
 #define	WDSD_LBA	0x40		/* use Logical Block Adressing */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * read parameters command returns this:
  */
@@ -317,4 +317,4 @@ extern struct wddma wddma[];
 
 void	wdintr __P((void *unit));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */