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

Discussed and okay drahn@. Okay deraadt@.

7 files changed, 26 insertions, 26 deletions

diff --git a/sys/arch/m68k/include/asm.h b/sys/arch/m68k/include/asm.h
index 6e806a72da0..640f5b12a95 100644
--- a/sys/arch/m68k/include/asm.h
+++ b/sys/arch/m68k/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.8 2007/11/24 20:58:26 deraadt Exp $	*/
+/*	$OpenBSD: asm.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.13 1997/04/24 22:49:39 thorpej Exp $	*/
 
 /*
@@ -39,8 +39,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ASM_H_
-#define _ASM_H_
+#ifndef _M68K_ASM_H_
+#define _M68K_ASM_H_
 
 #ifdef	__ELF__
 #define	_C_LABEL(name)		name
@@ -169,4 +169,4 @@
 
 #endif /* _KERNEL */
 
-#endif /* _ASM_H_ */
+#endif /* _M68K_ASM_H_ */
diff --git a/sys/arch/m68k/include/atomic.h b/sys/arch/m68k/include/atomic.h
index 9a411d7d0b8..46c7688f64f 100644
--- a/sys/arch/m68k/include/atomic.h
+++ b/sys/arch/m68k/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.3 2007/03/21 05:28:20 miod Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __M68K_ATOMIC_H__
-#define __M68K_ATOMIC_H__
+#ifndef _M68K_ATOMIC_H_
+#define _M68K_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -34,4 +34,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __M68K_ATOMIC_H__ */
+#endif /* _M68K_ATOMIC_H_ */
diff --git a/sys/arch/m68k/include/endian.h b/sys/arch/m68k/include/endian.h
index ca2e6ab46c6..76881edb8e4 100644
--- a/sys/arch/m68k/include/endian.h
+++ b/sys/arch/m68k/include/endian.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endian.h,v 1.17 2011/03/12 04:03:04 guenther Exp $	*/
+/*	$OpenBSD: endian.h,v 1.18 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _M68K_ENDIAN_H_
+#define _M68K_ENDIAN_H_
 
 #ifdef __GNUC__
 
@@ -55,4 +55,4 @@
 #define _BYTE_ORDER _BIG_ENDIAN
 #include <sys/endian.h>
 
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* _M68K_ENDIAN_H_ */
diff --git a/sys/arch/m68k/include/internal_types.h b/sys/arch/m68k/include/internal_types.h
index 4d1833cf8a0..4e56c8c7c4f 100644
--- a/sys/arch/m68k/include/internal_types.h
+++ b/sys/arch/m68k/include/internal_types.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:11 espie Exp $ */
+/* $OpenBSD: internal_types.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
 /* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
+#ifndef _M68K_INTERNAL_TYPES_H_
+#define _M68K_INTERNAL_TYPES_H_
 
 #endif
diff --git a/sys/arch/m68k/include/mutex.h b/sys/arch/m68k/include/mutex.h
index 4675d44e088..1840ec3856c 100644
--- a/sys/arch/m68k/include/mutex.h
+++ b/sys/arch/m68k/include/mutex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mutex.h,v 1.1 2007/02/03 20:08:49 miod Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.2 2011/03/23 16:54:35 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 _M68K_MUTEX_H_
+#define _M68K_MUTEX_H_
 
 /*
  * Simple non-mp implementation.
diff --git a/sys/arch/m68k/include/pmap_motorola.h b/sys/arch/m68k/include/pmap_motorola.h
index 67e1182b62e..02c819d6710 100644
--- a/sys/arch/m68k/include/pmap_motorola.h
+++ b/sys/arch/m68k/include/pmap_motorola.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_motorola.h,v 1.21 2010/12/26 15:40:59 miod Exp $	*/
+/*	$OpenBSD: pmap_motorola.h,v 1.22 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -36,8 +36,8 @@
  *	@(#)pmap.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef	_PMAP_MOTOROLA_H_
-#define	_PMAP_MOTOROLA_H_
+#ifndef	_M68K_M68K_M68K_PMAP_MOTOROLA_H_
+#define	_M68K_M68K_M68K_PMAP_MOTOROLA_H_
 
 #ifdef	_KERNEL
 
@@ -143,4 +143,4 @@ vaddr_t	pmap_prefer(vaddr_t, vaddr_t);
 
 #endif	/* _KERNEL */
 
-#endif /* !_PMAP_MOTOROLA_H_ */
+#endif /* !_M68K_M68K_M68K_PMAP_MOTOROLA_H_ */
diff --git a/sys/arch/m68k/include/pte_motorola.h b/sys/arch/m68k/include/pte_motorola.h
index 79e69583577..27fe0a1a53d 100644
--- a/sys/arch/m68k/include/pte_motorola.h
+++ b/sys/arch/m68k/include/pte_motorola.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pte_motorola.h,v 1.5 2005/09/25 22:19:57 miod Exp $	*/
+/*	$OpenBSD: pte_motorola.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -38,8 +38,8 @@
  *	@(#)pte.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef	_PTE_MOTOROLA_H_
-#define	_PTE_MOTOROLA_H_
+#ifndef	_M68K_M68K_M68K_PTE_MOTOROLA_H_
+#define	_M68K_M68K_M68K_PTE_MOTOROLA_H_
 
 /*
  * m68k hardware with motorola MMU segment/page table entries
@@ -110,4 +110,4 @@ typedef int	pt_entry_t;	/* Mach page table entry */
 #define	kvtopte(va) \
 	(&Sysmap[((unsigned)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT])
 
-#endif /* !_PTE_MOTOROLA_H_ */
+#endif /* !_M68K_M68K_M68K_PTE_MOTOROLA_H_ */