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

Discussed and okay drahn@. Okay deraadt@.

6 files changed, 24 insertions, 24 deletions

diff --git a/sys/arch/sgi/include/atomic.h b/sys/arch/sgi/include/atomic.h
index a8829697fd6..bc1f3a4a1cf 100644
--- a/sys/arch/sgi/include/atomic.h
+++ b/sys/arch/sgi/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __SGI_ATOMIC_H__
-#define __SGI_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <mips64/atomic.h>
 
-#endif /* __SGI_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/sgi/include/cpu.h b/sys/arch/sgi/include/cpu.h
index 011721c63fe..41ba8aa4834 100644
--- a/sys/arch/sgi/include/cpu.h
+++ b/sys/arch/sgi/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.11 2010/09/11 11:29:50 syuu Exp $ */
+/*	$OpenBSD: cpu.h,v 1.12 2011/03/23 16:54:36 pirofti Exp $ */
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,8 +41,8 @@
  *	from: @(#)cpu.h	8.4 (Berkeley) 1/4/94
  */
 
-#ifndef _SGI_CPU_H_
-#define _SGI_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 #ifdef _KERNEL
 #if defined(MULTIPROCESSOR) && !defined(_LOCORE)
@@ -78,4 +78,4 @@ void hw_cpu_init_secondary(struct cpu_info *);
 
 #include <mips64/cpu.h>
 
-#endif /* !_SGI_CPU_H_ */
+#endif /* !_MACHINE_CPU_H_ */
diff --git a/sys/arch/sgi/include/memconf.h b/sys/arch/sgi/include/memconf.h
index 00929344c40..306f0ef4c4d 100644
--- a/sys/arch/sgi/include/memconf.h
+++ b/sys/arch/sgi/include/memconf.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: memconf.h,v 1.2 2008/04/07 22:41:52 miod Exp $ */
+/*	$OpenBSD: memconf.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
 
-#ifndef	_SGI_MEMCONF_H_
-#define	_SGI_MEMCONF_H_
+#ifndef	_MACHINE_MEMCONF_H_
+#define	_MACHINE_MEMCONF_H_
 
 #define	MAXMEMSEGS	32
 
 #include <mips64/memconf.h>
 
-#endif	/* _SGI_MEMCONF_H_ */
+#endif	/* _MACHINE_MEMCONF_H_ */
diff --git a/sys/arch/sgi/include/mnode.h b/sys/arch/sgi/include/mnode.h
index f1ee600a3ca..274f80488e9 100644
--- a/sys/arch/sgi/include/mnode.h
+++ b/sys/arch/sgi/include/mnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mnode.h,v 1.15 2010/04/06 19:09:44 miod Exp $ */
+/*	$OpenBSD: mnode.h,v 1.16 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef __MACHINE_MNODE_H__
-#define __MACHINE_MNODE_H__
+#ifndef _MACHINE_MNODE_H_
+#define _MACHINE_MNODE_H_
 
 /*
  * Definitions for Nodes set up in M-Mode. Some stuff here
@@ -482,4 +482,4 @@ extern klinfo_t *kl_glass_console;
 extern gda_t *gda;
 extern uint maxnodes;
 
-#endif /* __MACHINE_MNODE_H__ */
+#endif /* _MACHINE_MNODE_H_ */
diff --git a/sys/arch/sgi/include/rbus_machdep.h b/sys/arch/sgi/include/rbus_machdep.h
index c98c66b0648..70f4ef2d8ea 100644
--- a/sys/arch/sgi/include/rbus_machdep.h
+++ b/sys/arch/sgi/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.1 2009/07/21 21:25:19 miod Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.2 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef	_SGI_RBUS_MACHDEP_H_
-#define	_SGI_RBUS_MACHDEP_H_
+#ifndef	_MACHINE_RBUS_MACHDEP_H_
+#define	_MACHINE_RBUS_MACHDEP_H_
 
 /*
  * RBUS mapping routines
@@ -57,4 +57,4 @@ md_space_unmap(rbus_tag_t rbt, bus_space_handle_t h, bus_size_t size,
 #define	pccbb_attach_hook(parent, self, paa)	\
 	do { /* nothing */} while (/*CONSTCOND*/0)
 
-#endif	/* _SGI_RBUS_MACHDEP_H_ */
+#endif	/* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/sgi/include/vmparam.h b/sys/arch/sgi/include/vmparam.h
index 174c25f9573..3b2042a94c1 100644
--- a/sys/arch/sgi/include/vmparam.h
+++ b/sys/arch/sgi/include/vmparam.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: vmparam.h,v 1.7 2009/12/08 22:15:48 miod Exp $ */
+/*	$OpenBSD: vmparam.h,v 1.8 2011/03/23 16:54:36 pirofti Exp $ */
 /* public domain */
-#ifndef _SGI_VMPARAM_H_
-#define _SGI_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 #define	VM_PHYSSEG_MAX	32	/* Max number of physical memory segments */
 
@@ -21,4 +21,4 @@
 
 #include <mips64/vmparam.h>
 
-#endif	/* _SGI_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */