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

Discussed and okay drahn@. Okay deraadt@.

11 files changed, 42 insertions, 42 deletions

diff --git a/sys/arch/aviion/include/atomic.h b/sys/arch/aviion/include/atomic.h
index 62b7808fefb..860cfdf9638 100644
--- a/sys/arch/aviion/include/atomic.h
+++ b/sys/arch/aviion/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:42 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __AVIION_ATOMIC_H__
-#define __AVIION_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <m88k/atomic.h>
 
-#endif /* __AVIION_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/aviion/include/autoconf.h b/sys/arch/aviion/include/autoconf.h
index 5a8d44b6e34..8e5f8c86086 100644
--- a/sys/arch/aviion/include/autoconf.h
+++ b/sys/arch/aviion/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.1 2006/05/09 18:19:19 miod Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */
 /*
  * Copyright (c) 1999, Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -34,8 +34,8 @@
  * Autoconfiguration information.
  */
 
-#ifndef _AVIION_AUTOCONF_H_
-#define _AVIION_AUTOCONF_H_
+#ifndef _MACHINE_AUTOCONF_H_
+#define _MACHINE_AUTOCONF_H_
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/aviion/include/av400.h b/sys/arch/aviion/include/av400.h
index 919cb1a51fc..f3ff49e3769 100644
--- a/sys/arch/aviion/include/av400.h
+++ b/sys/arch/aviion/include/av400.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: av400.h,v 1.7 2010/04/21 19:33:47 miod Exp $	*/
+/*	$OpenBSD: av400.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -43,8 +43,8 @@
  *
  */
 
-#ifndef	__MACHINE_AV400_H__
-#define	__MACHINE_AV400_H__
+#ifndef	_MACHINE_AV400_H_
+#define	_MACHINE_AV400_H_
 
 #define	AV400_PROM		0xffc00000
 #define	AV400_PROM_SIZE		0x00200000
@@ -139,4 +139,4 @@
 #define AV400_CMMU_D3	0xfff06000
 #define AV400_CMMU_I3	0xfff07000
 
-#endif	/* __MACHINE_AV400_H__ */
+#endif	/* _MACHINE_AV400_H_ */
diff --git a/sys/arch/aviion/include/av530.h b/sys/arch/aviion/include/av530.h
index 62f4b907b8e..a601d1bea33 100644
--- a/sys/arch/aviion/include/av530.h
+++ b/sys/arch/aviion/include/av530.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: av530.h,v 1.3 2010/04/24 18:46:55 miod Exp $	*/
+/*	$OpenBSD: av530.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (c) 2006, 2010 Miodrag Vallat
  *
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	__MACHINE_AV530_H__
-#define	__MACHINE_AV530_H__
+#ifndef	_MACHINE_AV530_H_
+#define	_MACHINE_AV530_H_
 
 #define	AV530_PROM		0xffc00000
 #define	AV530_PROM_SIZE		0x00080000
@@ -242,4 +242,4 @@
 #define AV530_CMMU6_I6	0xfff0e000
 #define AV530_CMMU6_I7	0xfff0f000
 
-#endif	/* __MACHINE_AV530_H__ */
+#endif	/* _MACHINE_AV530_H_ */
diff --git a/sys/arch/aviion/include/avcommon.h b/sys/arch/aviion/include/avcommon.h
index d2f31566634..c5f05347f85 100644
--- a/sys/arch/aviion/include/avcommon.h
+++ b/sys/arch/aviion/include/avcommon.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: avcommon.h,v 1.5 2010/04/21 19:33:47 miod Exp $	*/
+/*	$OpenBSD: avcommon.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -43,8 +43,8 @@
  *
  */
 
-#ifndef	__MACHINE_AVCOMMON_H__
-#define	__MACHINE_AVCOMMON_H__
+#ifndef	_MACHINE_AVCOMMON_H_
+#define	_MACHINE_AVCOMMON_H_
 
 /*
  * Common declarations for hardware level device registers and such,
@@ -140,4 +140,4 @@ extern u_int32_t ext_int_mask_val[NIPLS];
 
 #endif
 
-#endif	/* __MACHINE_AVCOMMON_H__ */
+#endif	/* _MACHINE_AVCOMMON_H_ */
diff --git a/sys/arch/aviion/include/bus.h b/sys/arch/aviion/include/bus.h
index a81fd5bd92b..87439d7b0d7 100644
--- a/sys/arch/aviion/include/bus.h
+++ b/sys/arch/aviion/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.3 2010/04/20 22:53:24 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB Sweden.  All rights reserved.
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AVIION_BUS_H_
-#define _AVIION_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 #include <machine/asm_macro.h>
 
@@ -362,4 +362,4 @@ void	bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
 paddr_t bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 
-#endif	/* _AVIION_BUS_H_ */
+#endif	/* _MACHINE_BUS_H_ */
diff --git a/sys/arch/aviion/include/cpu.h b/sys/arch/aviion/include/cpu.h
index fc813dc299e..137c0ef0ce2 100644
--- a/sys/arch/aviion/include/cpu.h
+++ b/sys/arch/aviion/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.3 2007/12/19 22:05:06 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -37,8 +37,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef	_AVIION_CPU_H_
-#define	_AVIION_CPU_H_
+#ifndef	_MACHINE_CPU_H_
+#define	_MACHINE_CPU_H_
 
 #include <m88k/cpu.h>
 
diff --git a/sys/arch/aviion/include/disklabel.h b/sys/arch/aviion/include/disklabel.h
index d4762b0b943..611bfe9b85e 100644
--- a/sys/arch/aviion/include/disklabel.h
+++ b/sys/arch/aviion/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.10 2010/04/24 20:14:03 miod Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.11 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef	_AVIION_DISKLABEL_H_
-#define	_AVIION_DISKLABEL_H_
+#ifndef	_MACHINE_DISKLABEL_H_
+#define	_MACHINE_DISKLABEL_H_
 
 #define	LABELSECTOR	1		/* sector containing label */
 #define	LABELOFFSET	0		/* offset of label in sector */
@@ -171,4 +171,4 @@ struct vdit_vdmremap_instance {
 	struct vdit_instance_id		remap_area;
 } __packed;
 
-#endif	/* _AVIION_DISKLABEL_H_ */
+#endif	/* _MACHINE_DISKLABEL_H_ */
diff --git a/sys/arch/aviion/include/intr.h b/sys/arch/aviion/include/intr.h
index 0483a817b4d..fc07673ea26 100644
--- a/sys/arch/aviion/include/intr.h
+++ b/sys/arch/aviion/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.3 2009/03/15 20:39:53 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AVIION_INTR_H_
-#define _AVIION_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 /*
  * IPL levels.
@@ -53,4 +53,4 @@
 
 #include <m88k/intr.h>
 
-#endif /* _AVIION_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/aviion/include/m8820x.h b/sys/arch/aviion/include/m8820x.h
index a8b019164d1..83d69a8a1b9 100644
--- a/sys/arch/aviion/include/m8820x.h
+++ b/sys/arch/aviion/include/m8820x.h
@@ -1,6 +1,6 @@
-#ifndef	_AVIION_M8820X_H_
-#define	_AVIION_M8820X_H_
-/*	$OpenBSD: m8820x.h,v 1.2 2006/05/20 11:58:35 miod Exp $ */
+#ifndef	_MACHINE_M8820X_H_
+#define	_MACHINE_M8820X_H_
+/*	$OpenBSD: m8820x.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -60,4 +60,4 @@
 
 #include <m88k/m8820x.h>
 
-#endif	/* _AVIION_M8820X_H_ */
+#endif	/* _MACHINE_M8820X_H_ */
diff --git a/sys/arch/aviion/include/prom.h b/sys/arch/aviion/include/prom.h
index f3280b146c2..d6a0f254933 100644
--- a/sys/arch/aviion/include/prom.h
+++ b/sys/arch/aviion/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.4 2010/12/23 20:05:08 miod Exp $	*/
+/*	$OpenBSD: prom.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (c) 2006, Miodrag Vallat.
  *
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __AVIION_PROM_H__
-#define __AVIION_PROM_H__
+#ifndef _MACHINE_PROM_H_
+#define _MACHINE_PROM_H_
 
 #include <sys/cdefs.h>
 
@@ -82,4 +82,4 @@ void	scm_putcrlf(void);
 __dead void scm_reboot(const char *);
 u_int	scm_sysid(void);
 
-#endif /* __AVIION_PROM_H__ */
+#endif /* _MACHINE_PROM_H_ */