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.

18 files changed, 37 insertions, 36 deletions

diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h
index 47b2a2c..b185295 100644
--- a/sys/alpha/include/asm.h
+++ b/sys/alpha/include/asm.h
@@ -617,7 +617,7 @@ label:	ASCIZ msg;						\
  * Kernel RCS ID tag and copyright macros
  */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef __ELF__
 #define	__KERNEL_SECTIONSTRING(_sec, _str)				\
@@ -635,4 +635,4 @@ label:	ASCIZ msg;						\
 #define	__KERNEL_RCSID(_n, _s)		/* nothing */
 #endif
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/alpha/include/clock.h b/sys/alpha/include/clock.h
index f243f8b..a5f1b62 100644
--- a/sys/alpha/include/clock.h
+++ b/sys/alpha/include/clock.h
@@ -9,7 +9,7 @@
 #ifndef _MACHINE_CLOCK_H_
 #define	_MACHINE_CLOCK_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 extern	int	disable_rtc_set;
 extern	int	wall_cmos_clock;
@@ -20,6 +20,6 @@ int	sysbeep __P((int pitch, int period));
 int	acquire_timer2 __P((int mode));
 int	release_timer2 __P((void));
 
-#endif /* KERNEL */
+#endif
 
 #endif /* !_MACHINE_CLOCK_H_ */
diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h
index d3f24c2..b6b5b41 100644
--- a/sys/alpha/include/cpu.h
+++ b/sys/alpha/include/cpu.h
@@ -90,7 +90,7 @@ struct clockframe {
 
 #define	aston()		(astpending = 1)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 u_int32_t astpending;		/* need to trap before returning to user mode */
 u_int32_t intr_nesting_level;	/* bookeeping only; counts software intr */
 u_int32_t want_resched;		/* resched() was called */
@@ -124,7 +124,7 @@ u_int32_t want_resched;		/* resched() was called */
 	{ "wall_cmos_clock", CTLTYPE_INT }, \
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 struct pcb;
 struct proc;
@@ -176,6 +176,6 @@ void	syscall __P((u_int64_t, struct trapframe *));
 void	trap __P((unsigned long, unsigned long, unsigned long, unsigned long,
 	    struct trapframe *));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* _ALPHA_CPU_H_ */
diff --git a/sys/alpha/include/cpuconf.h b/sys/alpha/include/cpuconf.h
index 1965a5a..02ceb8b 100644
--- a/sys/alpha/include/cpuconf.h
+++ b/sys/alpha/include/cpuconf.h
@@ -1,3 +1,4 @@
+/* $FreeBSD$ */
 /*	$NetBSD: cpuconf.h,v 1.7 1997/11/06 00:42:03 thorpej Exp $	*/
 #ifndef	_ALPHA_CPUCONF_H
 #define	_ALPHA_CPUCONF_H
@@ -34,7 +35,7 @@
  * Additional reworking by Matthew Jacob for NASA/Ames Research Center.
  * Copyright (c) 1997
  */
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * Platform Specific Information and Function Hooks.
  *
@@ -119,5 +120,5 @@ extern int ncpuinit;
 extern void platform_not_configured __P((int));
 extern void platform_not_supported __P((int));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 #endif /* !_ALPHA_CPUCONF_H */
diff --git a/sys/alpha/include/cpufunc.h b/sys/alpha/include/cpufunc.h
index eb22526..98f72e8 100644
--- a/sys/alpha/include/cpufunc.h
+++ b/sys/alpha/include/cpufunc.h
@@ -29,7 +29,7 @@
 #ifndef _MACHINE_CPUFUNC_H_
 #define _MACHINE_CPUFUNC_H_
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #include <sys/types.h>
 #include <machine/chipset.h>
@@ -100,6 +100,6 @@ extern void memsetw(void *, int, size_t);
 extern void memsetw_io(u_int32_t, int, size_t);
 
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/alpha/include/elf.h b/sys/alpha/include/elf.h
index 892d96d..fef95ce 100644
--- a/sys/alpha/include/elf.h
+++ b/sys/alpha/include/elf.h
@@ -135,7 +135,7 @@ __ElfType(Auxinfo);
 #define ELF_TARG_MACH	EM_ALPHA
 #define ELF_TARG_VER	1
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 /*
  * On the Alpha we load the dynamic linker where a userland call
@@ -146,5 +146,5 @@ __ElfType(Auxinfo);
 #define ELF_RTLD_ADDR(vmspace) \
     (round_page((vm_offset_t)(vmspace)->vm_daddr + MAXDSIZ))
 
-#endif /* KERNEL */
+#endif
 #endif /* !_MACHINE_ELF_H_ */
diff --git a/sys/alpha/include/fpu.h b/sys/alpha/include/fpu.h
index 66c5577..250db28 100644
--- a/sys/alpha/include/fpu.h
+++ b/sys/alpha/include/fpu.h
@@ -115,7 +115,7 @@
 	__asm__("mt_fpcr %0" : : "f" (x)); \
 	__asm__("trapb")
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 extern int fp_software_completion(u_int64_t regmask, struct proc *p);
 
diff --git a/sys/alpha/include/in_cksum.h b/sys/alpha/include/in_cksum.h
index 7691d71..e004779 100644
--- a/sys/alpha/include/in_cksum.h
+++ b/sys/alpha/include/in_cksum.h
@@ -69,10 +69,10 @@ in_cksum_update(struct ip *ip)
 #endif
 
 typedef	unsigned in_psum_t;
-#ifdef KERNEL
+#ifdef _KERNEL
 u_int in_cksum_hdr(const struct ip *ip);
 in_psum_t in_cksum_partial(in_psum_t psum, const u_short *w, int len);
 int	in_cksum_finalize(in_psum_t psum);
-#endif /* KERNEL */
+#endif
 
 #endif /* _MACHINE_IN_CKSUM_H_ */
diff --git a/sys/alpha/include/intrcnt.h b/sys/alpha/include/intrcnt.h
index d324942..440f819 100644
--- a/sys/alpha/include/intrcnt.h
+++ b/sys/alpha/include/intrcnt.h
@@ -72,7 +72,7 @@
 #	define	INTRCNT_KN300_I2C_CTRL	INTRCNT_KN300_IRQ + 17
 #	define	INTRCNT_KN300_I2C_BUS	INTRCNT_KN300_IRQ + 18
 
-#ifdef KERNEL
+#ifdef _KERNEL
 #ifndef _LOCORE
 extern volatile long intrcnt[];
 #endif
diff --git a/sys/alpha/include/ioctl_fd.h b/sys/alpha/include/ioctl_fd.h
index 46f57ba..dd6e9d0 100644
--- a/sys/alpha/include/ioctl_fd.h
+++ b/sys/alpha/include/ioctl_fd.h
@@ -31,7 +31,7 @@
 #ifndef	_MACHINE_IOCTL_FD_H_
 #define	_MACHINE_IOCTL_FD_H_
 
-#ifndef KERNEL
+#ifndef _KERNEL
 #include <sys/types.h>
 #endif
 #include <sys/ioccom.h>
diff --git a/sys/alpha/include/pc/vesa.h b/sys/alpha/include/pc/vesa.h
index 5b21408..96f027e 100644
--- a/sys/alpha/include/pc/vesa.h
+++ b/sys/alpha/include/pc/vesa.h
@@ -112,7 +112,7 @@ struct vesa_mode
     u_int8_t		v_offscreensize;
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #define VESA_MODE(x)	((x) >= M_VESA_BASE)
 
@@ -123,6 +123,6 @@ int vesa_unload_ioctl(void);
 int vesa_load(void);
 #endif
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !_MACHINE_PC_VESA_H */
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index 321326f..bd1eb6c 100644
--- a/sys/alpha/include/pmap.h
+++ b/sys/alpha/include/pmap.h
@@ -107,14 +107,14 @@ typedef alpha_pt_entry_t pt_entry_t;
 /*
  * Address of current address space page table maps
  */
-#ifdef KERNEL
+#ifdef _KERNEL
 extern pt_entry_t PTmap[];	/* lev3 page tables */
 extern pt_entry_t PTlev2[];	/* lev2 page tables */
 extern pt_entry_t PTlev1[];	/* lev1 page table */
 extern pt_entry_t PTlev1pte;	/* pte that maps lev1 page table */
 #endif
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * virtual address to page table entry and
  * to physical address.
@@ -152,7 +152,7 @@ alpha_XXX_dmamap(vm_offset_t va)
        return (pmap_kextract(va) | alpha_XXX_dmamap_or);
 }
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 /*
  * Pmap stuff
@@ -188,7 +188,7 @@ struct pmap {
 
 typedef struct pmap	*pmap_t;
 
-#ifdef KERNEL
+#ifdef _KERNEL
 extern pmap_t		kernel_pmap;
 #endif
 
@@ -209,7 +209,7 @@ typedef struct pv_entry {
 #define	PV_CI		0x01	/* all entries must be cache inhibited */
 #define	PV_PTPAGE	0x02	/* entry maps a page table page */
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 
 extern caddr_t	CADDR1;
 extern pt_entry_t *CMAP1;
@@ -235,7 +235,7 @@ void	pmap_set_opt_bsp	__P((void));
 void	pmap_deactivate __P((struct proc *p));
 void	pmap_emulate_reference __P((struct proc *p, vm_offset_t v, int user, int write));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* !LOCORE */
 
diff --git a/sys/alpha/include/profile.h b/sys/alpha/include/profile.h
index 0eb8ef2..57fbb69 100644
--- a/sys/alpha/include/profile.h
+++ b/sys/alpha/include/profile.h
@@ -207,7 +207,7 @@ LX98:	ldgp	$29,0($27);	\
 				\
 	.end	_mcount");
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * The following two macros do splhigh and splx respectively.
  * _alpha_pal_swpipl is a special version of alpha_pal_swpipl which
@@ -232,6 +232,6 @@ void	stopguprof __P((struct gmonparam *p));
 #define stopguprof(p)
 #endif /* GUPROF */
 
-#else /* !KERNEL */
+#else /* !_KERNEL */
 typedef u_long	uintfptr_t;
 #endif
diff --git a/sys/alpha/include/prom.h b/sys/alpha/include/prom.h
index 5c48e64..9991213 100644
--- a/sys/alpha/include/prom.h
+++ b/sys/alpha/include/prom.h
@@ -94,7 +94,7 @@ int	prom_getenv __P((int, char *, int));
 	prom_dispatch(PROM_R_GETENV, id, (u_int64_t)buf, len, 0)
 
 #ifndef ASSEMBLER
-#ifdef KERNEL
+#ifdef _KERNEL
 void	promcnputc __P((dev_t, int));
 int	promcngetc __P((dev_t));
 int	promcncheckc __P((dev_t));
@@ -102,5 +102,5 @@ int	promcncheckc __P((dev_t));
 u_int64_t	prom_dispatch __P((u_int64_t, u_int64_t, u_int64_t, u_int64_t,
 		    u_int64_t));
 void		init_bootstrap_console __P((void));
-#endif /* KERNEL */
+#endif /* _KERNEL */
 #endif /* ASSEMBLER */
diff --git a/sys/alpha/include/ptrace.h b/sys/alpha/include/ptrace.h
index d69c547..2af0ec4 100644
--- a/sys/alpha/include/ptrace.h
+++ b/sys/alpha/include/ptrace.h
@@ -47,10 +47,10 @@
 
 #define FIX_SSTEP(p)	ptrace_clear_single_step(p)
 
-#ifdef KERNEL
+#ifdef _KERNEL
 int	ptrace_clear_single_step __P((struct proc *p));
 int	ptrace_read_u_check __P((struct proc *p, vm_offset_t off, size_t len));
-#endif /* !KERNEL */
+#endif
 
 #endif
 
diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h
index 879aeed..172c302 100644
--- a/sys/alpha/include/reg.h
+++ b/sys/alpha/include/reg.h
@@ -107,7 +107,7 @@ struct dbreg {
 	unsigned long wankage;
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 void	restorefpstate __P((struct fpreg *));
 void	savefpstate __P((struct fpreg *));
 void	setregs __P((struct proc *, u_long, u_long, u_long));
diff --git a/sys/alpha/include/sysarch.h b/sys/alpha/include/sysarch.h
index 8eda490..6024399 100644
--- a/sys/alpha/include/sysarch.h
+++ b/sys/alpha/include/sysarch.h
@@ -43,7 +43,7 @@
 #define ALPHA_GET_FPMASK	1
 #define ALPHA_SET_FPMASK	2
 
-#ifndef KERNEL
+#ifndef _KERNEL
 #include <sys/cdefs.h>
 
 union descriptor;
@@ -51,6 +51,6 @@ union descriptor;
 __BEGIN_DECLS
 int		alpha_sethae __P((u_int64_t));
 __END_DECLS
-#endif /* !KERNEL */
+#endif
 
 #endif /* !_MACHINE_SYSARCH_H_ */
diff --git a/sys/alpha/include/types.h b/sys/alpha/include/types.h
index 03e1869..cf282de 100644
--- a/sys/alpha/include/types.h
+++ b/sys/alpha/include/types.h
@@ -59,7 +59,7 @@ typedef	unsigned long	vm_size_t;
 
 typedef __int64_t		register_t;
 
-#ifdef KERNEL
+#ifdef _KERNEL
 typedef	long		intfptr_t;
 typedef	unsigned long	uintfptr_t;
 #endif