Normalize sentinel. Use _MACHINE_*_H_ and _<ARCH>_*_H_ properly and consitently.

Discussed and okay drahn@. Okay deraadt@.

20 files changed, 77 insertions, 77 deletions

diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h
index c7bd017aa70..9360d2fa9ec 100644
--- a/sys/arch/arm/include/asm.h
+++ b/sys/arch/arm/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: asm.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $	*/
 
 /*
@@ -35,8 +35,8 @@
  *	from: @(#)asm.h	5.5 (Berkeley) 5/7/91
  */
 
-#ifndef _ARM32_ASM_H_
-#define _ARM32_ASM_H_
+#ifndef _ARM_ASM_H_
+#define _ARM_ASM_H_
 
 #ifdef __ELF__
 # define _C_LABEL(x)	x
diff --git a/sys/arch/arm/include/atomic.h b/sys/arch/arm/include/atomic.h
index ebdc3ade1c6..5b2de71e43b 100644
--- a/sys/arch/arm/include/atomic.h
+++ b/sys/arch/arm/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.7 2010/04/22 21:03:17 drahn Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __ARM_ATOMIC_H__
-#define __ARM_ATOMIC_H__
+#ifndef _ARM_ATOMIC_H_
+#define _ARM_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -16,4 +16,4 @@ void atomic_setbits_int(__volatile unsigned int *, unsigned int);
 void atomic_clearbits_int(__volatile unsigned int *, unsigned int);
 
 #endif /* defined(_KERNEL) */
-#endif /* __ARM_ATOMIC_H__ */
+#endif /* _ARM_ATOMIC_H_ */
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index 187ff95fadb..6fdcdf83a87 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.13 2010/04/04 12:49:30 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.14 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.12 2003/10/23 15:03:24 scw Exp $	*/
 
 /*-
@@ -62,8 +62,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ARM32_BUS_H_
-#define _ARM32_BUS_H_
+#ifndef _ARM_BUS_H_
+#define _ARM_BUS_H_
 
 /*
  * Addresses (in bus space).
@@ -889,4 +889,4 @@ bus_space_write_raw_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
     !!! bus_space_write_raw_region_8 unimplemented !!!
 #endif
 
-#endif /* _ARM32_BUS_H_ */
+#endif /* _ARM_BUS_H_ */
diff --git a/sys/arch/arm/include/cdefs.h b/sys/arch/arm/include/cdefs.h
index 324c07ef9c4..b903dd9d60c 100644
--- a/sys/arch/arm/include/cdefs.h
+++ b/sys/arch/arm/include/cdefs.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: cdefs.h,v 1.2 2005/11/24 20:46:44 deraadt Exp $	*/
+/*	$OpenBSD: cdefs.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
-#ifndef	_MACHINE_CDEFS_H_
-#define	_MACHINE_CDEFS_H_
+#ifndef	_ARM_CDEFS_H_
+#define	_ARM_CDEFS_H_
 
 #if defined(lint)
 #define __indr_reference(sym,alias)	__lint_equal__(sym,alias)
@@ -16,4 +16,4 @@
 	    " ; .ascii \"" msg "\" ; .text")
 #endif
 
-#endif /* !_MACHINE_CDEFS_H_ */
+#endif /* !_ARM_CDEFS_H_ */
diff --git a/sys/arch/arm/include/conf.h b/sys/arch/arm/include/conf.h
index 8ce86aa35a0..9fe2f2d3c52 100644
--- a/sys/arch/arm/include/conf.h
+++ b/sys/arch/arm/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.8 2010/11/28 20:48:46 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: conf.h,v 1.7 2002/04/19 01:04:39 wiz Exp $	*/
 
 /*
@@ -40,8 +40,8 @@
  * Prototypes for device driver functions
  */
 
-#ifndef _ARM_CONF_H
-#define	_ARM_CONF_H
+#ifndef _ARM_CONF_H_
+#define	_ARM_CONF_H_
  
 
 #include <sys/conf.h>
@@ -70,4 +70,4 @@ cdev_decl(pci);
 cdev_decl(apm);
 cdev_decl(spkr);
 
-#endif	/* _ARM_CONF_H_ */
+#endif	/* _ARM_CONF_H__ */
diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h
index f21266a8087..e3dd2d860b0 100644
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.7 2010/04/22 21:01:45 drahn Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $	*/
 
 /*
@@ -40,8 +40,8 @@
  * Prototypes for cpu, mmu and tlb related functions.
  */
 
-#ifndef _ARM32_CPUFUNC_H_
-#define _ARM32_CPUFUNC_H_
+#ifndef _ARM_CPUFUNC_H_
+#define _ARM_CPUFUNC_H_
 
 #ifdef _KERNEL
 
@@ -602,6 +602,6 @@ extern int	arm_dcache_align;
 extern int	arm_dcache_align_mask;
 
 #endif	/* _KERNEL */
-#endif	/* _ARM32_CPUFUNC_H_ */
+#endif	/* _ARM_CPUFUNC_H_ */
 
 /* End of cpufunc.h */
diff --git a/sys/arch/arm/include/endian.h b/sys/arch/arm/include/endian.h
index 1e834f9e0df..b5221b6cb5f 100644
--- a/sys/arch/arm/include/endian.h
+++ b/sys/arch/arm/include/endian.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: endian.h,v 1.4 2011/03/11 15:17:08 pirofti Exp $	*/
+/*	$OpenBSD: endian.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _ARM_ENDIAN_H_
+#define _ARM_ENDIAN_H_
 
 #ifdef __ARMEB__
 #define _BYTE_ORDER _BIG_ENDIAN
@@ -11,4 +11,4 @@
 #define	__STRICT_ALIGNMENT
 #include <sys/endian.h>
 
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* _ARM_ENDIAN_H_ */
diff --git a/sys/arch/arm/include/float.h b/sys/arch/arm/include/float.h
index 46d7792966e..a97befef15e 100644
--- a/sys/arch/arm/include/float.h
+++ b/sys/arch/arm/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.3 2008/07/21 20:50:54 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
 
 /*
@@ -45,8 +45,8 @@
  *	@(#)float.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _ARM32_FLOAT_H_
-#define _ARM32_FLOAT_H_
+#ifndef _ARM_FLOAT_H_
+#define _ARM_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -88,4 +88,4 @@ __END_DECLS
 #define LDBL_MAX	DBL_MAX
 #define LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
-#endif	/* _ARM32_FLOAT_H_ */
+#endif	/* _ARM_FLOAT_H_ */
diff --git a/sys/arch/arm/include/ieeefp.h b/sys/arch/arm/include/ieeefp.h
index 6aaf2b950e1..d4d57c8114f 100644
--- a/sys/arch/arm/include/ieeefp.h
+++ b/sys/arch/arm/include/ieeefp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieeefp.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: ieeefp.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
 
 /* 
@@ -6,8 +6,8 @@
  * Public domain.
  */
 
-#ifndef _ARM32_IEEEFP_H_
-#define _ARM32_IEEEFP_H_
+#ifndef _ARM_IEEEFP_H_
+#define _ARM_IEEEFP_H_
 
 /* FP exception codes */
 
@@ -38,4 +38,4 @@ typedef enum {
     FP_RZ=3			/* round to zero (truncate) */
 } fp_rnd;
 
-#endif /* _ARM32_IEEEFP_H_ */
+#endif /* _ARM_IEEEFP_H_ */
diff --git a/sys/arch/arm/include/isa_machdep.h b/sys/arch/arm/include/isa_machdep.h
index 92249a0df36..21b2c0588c8 100644
--- a/sys/arch/arm/include/isa_machdep.h
+++ b/sys/arch/arm/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.6 2010/11/22 21:07:40 miod Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.3 2002/01/07 22:58:07 chris Exp $	*/
 
 /*-
@@ -31,8 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ARM32_ISA_MACHDEP_H_
-#define _ARM32_ISA_MACHDEP_H_
+#ifndef _ARM_ISA_MACHDEP_H_
+#define _ARM_ISA_MACHDEP_H_
 
 #include <machine/bus.h>
 #include <dev/isa/isadmavar.h>
@@ -173,4 +173,4 @@ void	isa_intr_init(void);
  */
 void isa_fillw(u_int val, void *addr, size_t len);
 
-#endif	/* _ARM32_ISA_MACHDEP_H_ XXX */
+#endif	/* _ARM_ISA_MACHDEP_H_ XXX */
diff --git a/sys/arch/arm/include/limits.h b/sys/arch/arm/include/limits.h
index d6cfb8b94de..75084da58ca 100644
--- a/sys/arch/arm/include/limits.h
+++ b/sys/arch/arm/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.4 2009/11/27 19:54:35 guenther Exp $	*/
+/*	$OpenBSD: limits.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: limits.h,v 1.4 2003/04/28 23:16:18 bjh21 Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	from: @(#)limits.h	7.2 (Berkeley) 6/28/90
  */
 
-#ifndef	_ARM32_LIMITS_H_
-#define	_ARM32_LIMITS_H_
+#ifndef	_ARM_LIMITS_H_
+#define	_ARM_LIMITS_H_
 
 #include <sys/cdefs.h>
 
@@ -53,4 +53,4 @@
 
 #endif /* __BSD_VISIBLE */
 
-#endif	/* _ARM32_LIMITS_H_ */
+#endif	/* _ARM_LIMITS_H_ */
diff --git a/sys/arch/arm/include/machdep.h b/sys/arch/arm/include/machdep.h
index dead7bd4433..2b03ed76562 100644
--- a/sys/arch/arm/include/machdep.h
+++ b/sys/arch/arm/include/machdep.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: machdep.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
+/*	$OpenBSD: machdep.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */
 
-#ifndef _ARM32_BOOT_MACHDEP_H_
-#define _ARM32_BOOT_MACHDEP_H_
+#ifndef _ARM_MACHDEP_H_
+#define _ARM_MACHDEP_H_
 
 /* misc prototypes used by the many arm machdeps */
 void halt (void);
diff --git a/sys/arch/arm/include/mutex.h b/sys/arch/arm/include/mutex.h
index 87e0f873060..9dcea763704 100644
--- a/sys/arch/arm/include/mutex.h
+++ b/sys/arch/arm/include/mutex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mutex.h,v 1.1 2007/12/05 16:08:04 deraadt Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef _MACHINE_MUTEX_H_
-#define _MACHINE_MUTEX_H_
+#ifndef _ARM_MUTEX_H_
+#define _ARM_MUTEX_H_
 
 /*
  * Simple non-mp implementation.
diff --git a/sys/arch/arm/include/pio.h b/sys/arch/arm/include/pio.h
index 280c3c2d4c5..e7828aef407 100644
--- a/sys/arch/arm/include/pio.h
+++ b/sys/arch/arm/include/pio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pio.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: pio.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pio.h,v 1.1 2001/02/23 21:23:48 reinoud Exp $	*/
 
 /*
@@ -34,8 +34,8 @@
  *    even if advised of the possibility of such damage.
  */
 
-#ifndef _ARM32_PIO_H_
-#define _ARM32_PIO_H_
+#ifndef _ARM_PIO_H_
+#define _ARM_PIO_H_
 
 #include <machine/bus.h>
 
@@ -44,4 +44,4 @@ extern struct bus_space isa_io_bs_tag;
 #define	inb(port)	 bus_space_read_1( &isa_io_bs_tag, (bus_space_handle_t)isa_io_bs_tag.bs_cookie, (port))
 #define	outb(port, byte) bus_space_write_1(&isa_io_bs_tag, (bus_space_handle_t)isa_io_bs_tag.bs_cookie, (port), (byte))
 
-#endif /* _ARM32_PIO_H_ */
+#endif /* _ARM_PIO_H_ */
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index 51c2a23816f..a1be2bd7280 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.16 2011/01/04 21:11:41 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.17 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $	*/
 
 /*
@@ -66,8 +66,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_PMAP_H_
-#define	_ARM32_PMAP_H_
+#ifndef	_ARM_PMAP_H_
+#define	_ARM_PMAP_H_
 
 #ifdef _KERNEL
 
@@ -624,4 +624,4 @@ extern uint32_t pmap_alias_bits;
 
 #endif /* _KERNEL */
 
-#endif	/* _ARM32_PMAP_H_ */
+#endif	/* _ARM_PMAP_H_ */
diff --git a/sys/arch/arm/include/proc.h b/sys/arch/arm/include/proc.h
index 539c30c05fb..826968c4bd7 100644
--- a/sys/arch/arm/include/proc.h
+++ b/sys/arch/arm/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.2 2005/09/15 21:16:35 miod Exp $	*/
+/*	$OpenBSD: proc.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: proc.h,v 1.5 2003/03/01 04:36:39 thorpej Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_PROC_H_
-#define	_ARM32_PROC_H_
+#ifndef	_ARM_PROC_H_
+#define	_ARM_PROC_H_
 
 /*
  * Machine-dependent part of the proc structure for arm.
@@ -47,4 +47,4 @@ struct mdproc {
 	void	*pmc_state;		/* port-specific pmc state */
 };
 
-#endif /* _ARM32_PROC_H_ */
+#endif /* _ARM_PROC_H_ */
diff --git a/sys/arch/arm/include/reg.h b/sys/arch/arm/include/reg.h
index 28c1b43b26e..237c789ef6b 100644
--- a/sys/arch/arm/include/reg.h
+++ b/sys/arch/arm/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: reg.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: reg.h,v 1.1 2001/02/11 14:51:55 bjh21 Exp $	*/
 
 /*
@@ -34,8 +34,8 @@
  *	@(#)reg.h	5.5 (Berkeley) 1/18/91
  */
 
-#ifndef _ARM32_REG_H_
-#define _ARM32_REG_H_
+#ifndef _ARM_REG_H_
+#define _ARM_REG_H_
 
 #include <machine/fp.h>
 
@@ -52,4 +52,4 @@ struct fpreg {
 	fp_reg_t fpr[8];
 };
 
-#endif /* !_ARM32_REG_H_ */
+#endif /* !_ARM_REG_H_ */
diff --git a/sys/arch/arm/include/signal.h b/sys/arch/arm/include/signal.h
index 6bac6aca5e2..5db3568611b 100644
--- a/sys/arch/arm/include/signal.h
+++ b/sys/arch/arm/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.5 2006/05/26 20:31:25 miod Exp $	*/
+/*	$OpenBSD: signal.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: signal.h,v 1.5 2003/10/18 17:57:21 briggs Exp $	*/
 
 /*
@@ -44,8 +44,8 @@
  * Created      : 30/09/94
  */
 
-#ifndef _ARM32_SIGNAL_H_
-#define _ARM32_SIGNAL_H_
+#ifndef _ARM_SIGNAL_H_
+#define _ARM_SIGNAL_H_
 
 #ifndef _LOCORE
 #include <sys/cdefs.h>
@@ -90,4 +90,4 @@ struct sigcontext {
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
 #endif /* !_LOCORE */
 
-#endif	/* !_ARM32_SIGNAL_H_ */
+#endif	/* !_ARM_SIGNAL_H_ */
diff --git a/sys/arch/arm/include/stdarg.h b/sys/arch/arm/include/stdarg.h
index 6161c58b8ce..0bcb8df025c 100644
--- a/sys/arch/arm/include/stdarg.h
+++ b/sys/arch/arm/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.8 2011/03/02 18:31:58 matthew Exp $ */
+/*	$OpenBSD: stdarg.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $ */
 /*	$NetBSD: stdarg.h,v 1.7 2003/08/07 16:26:53 agc Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	from: @(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _ARM32_STDARG_H_
-#define	_ARM32_STDARG_H_
+#ifndef _ARM_STDARG_H_
+#define	_ARM_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>
@@ -53,4 +53,4 @@ typedef __va_list	va_list;
 #define	va_end(ap)		__builtin_va_end((ap))
 #define	__va_copy(dest, src)	__builtin_va_copy((dest), (src))
 
-#endif /* !_ARM32_STDARG_H_ */
+#endif /* !_ARM_STDARG_H_ */
diff --git a/sys/arch/arm/include/vmparam.h b/sys/arch/arm/include/vmparam.h
index e32e14743cf..29e2c9ed2f9 100644
--- a/sys/arch/arm/include/vmparam.h
+++ b/sys/arch/arm/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.7 2010/12/15 05:30:19 tedu Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.18 2003/05/21 18:04:44 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ARM_ARM_VMPARAM_H_
-#define	_ARM_ARM_VMPARAM_H_
+#ifndef _ARM_VMPARAM_H_
+#define	_ARM_VMPARAM_H_
 
 #ifdef _KERNEL
 
@@ -134,4 +134,4 @@ do {									\
 
 #endif /* _KERNEL */
 
-#endif /* _ARM_ARM_VMPARAM_H_ */
+#endif /* _ARM_VMPARAM_H_ */