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

Discussed and okay drahn@. Okay deraadt@.

9 files changed, 34 insertions, 34 deletions

diff --git a/sys/arch/hppa64/include/_types.h b/sys/arch/hppa64/include/_types.h
index f6d4586f18a..84cf50aac4c 100644
--- a/sys/arch/hppa64/include/_types.h
+++ b/sys/arch/hppa64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.5 2010/07/24 21:27:57 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
-#ifndef _HPPA64__TYPES_H_
-#define _HPPA64__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
 typedef struct label_t {
@@ -123,4 +123,4 @@ typedef	void *			__wctype_t;
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif	/* _HPPA64__TYPES_H_ */
+#endif	/* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/hppa64/include/atomic.h b/sys/arch/hppa64/include/atomic.h
index d8474e881ad..bb4a8e244c8 100644
--- a/sys/arch/hppa64/include/atomic.h
+++ b/sys/arch/hppa64/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.3 2010/07/01 03:36:12 jsing Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __HPPA64_ATOMIC_H__
-#define __HPPA64_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -52,4 +52,4 @@ atomic_clearbits_long(__volatile unsigned long *uip, unsigned long v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __HPPA64_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/hppa64/include/cpufunc.h b/sys/arch/hppa64/include/cpufunc.h
index d048f000480..5a5c83af6ef 100644
--- a/sys/arch/hppa64/include/cpufunc.h
+++ b/sys/arch/hppa64/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.1 2010/07/01 04:29:10 jsing Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -26,8 +26,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HPPA64_CPUFUNC_H_
-#define _HPPA64_CPUFUNC_H_
+#ifndef _MACHINE_CPUFUNC_H_
+#define _MACHINE_CPUFUNC_H_
 
 #define	mtsp(v,r)	__asm __volatile ("mtsp %0,%1":: "r" (v), "i" (r))
 
diff --git a/sys/arch/hppa64/include/float.h b/sys/arch/hppa64/include/float.h
index b6c689c8444..8c7b4e7abb0 100644
--- a/sys/arch/hppa64/include/float.h
+++ b/sys/arch/hppa64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.2 2008/07/21 20:50:54 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -31,8 +31,8 @@
  *	@(#)float.h	7.1 (Berkeley) 5/8/90
  */
 
-#ifndef _HPPA_FLOAT_H_
-#define _HPPA_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <sys/cdefs.h>
 
diff --git a/sys/arch/hppa64/include/ieeefp.h b/sys/arch/hppa64/include/ieeefp.h
index d33f6ac542e..1956810c69b 100644
--- a/sys/arch/hppa64/include/ieeefp.h
+++ b/sys/arch/hppa64/include/ieeefp.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ieeefp.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Written by Miodrag Vallat.  Public domain.
  */
 
-#ifndef _HPPA64_IEEEFP_H_
-#define _HPPA64_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_INV	0x10	/* invalid operation exception */
@@ -21,4 +21,4 @@ typedef enum {
     FP_RM=3			/* round toward negative infinity */
 } fp_rnd;
 
-#endif /* _HPPA64_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/hppa64/include/loadfile_machdep.h b/sys/arch/hppa64/include/loadfile_machdep.h
index e21f59d021c..093bf0978c1 100644
--- a/sys/arch/hppa64/include/loadfile_machdep.h
+++ b/sys/arch/hppa64/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HPPA64_LOADFILE_MACHDEP_H_
-#define	_HPPA64_LOADFILE_MACHDEP_H_
+#ifndef _MACHINE_LOADFILE_MACHDEP_H_
+#define	_MACHINE_LOADFILE_MACHDEP_H_
 
 #define	BOOT_ELF
 #define	ELFSIZE	64
@@ -73,4 +73,4 @@ void vcopy(u_long, u_long, u_long *, size_t);
 void vzero(u_long, u_long *, size_t);
 
 #endif
-#endif /* ! _HPPA64_LOADFILE_MACHDEP_H_ */
+#endif /* ! _MACHINE_LOADFILE_MACHDEP_H_ */
diff --git a/sys/arch/hppa64/include/lock.h b/sys/arch/hppa64/include/lock.h
index a6d910c01dc..6bd03940965 100644
--- a/sys/arch/hppa64/include/lock.h
+++ b/sys/arch/hppa64/include/lock.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lock.h,v 1.2 2010/07/01 04:20:38 jsing Exp $	*/
+/*	$OpenBSD: lock.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* public domain */
 
-#ifndef	_HPPA64_LOCK_H_
-#define	_HPPA64_LOCK_H_
+#ifndef	_MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 #include <machine/atomic.h>
 
@@ -47,4 +47,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *l)
 	*l = __SIMPLELOCK_UNLOCKED;
 }
 
-#endif	/* _HPPA64_LOCK_H_ */
+#endif	/* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/hppa64/include/rbus_machdep.h b/sys/arch/hppa64/include/rbus_machdep.h
index 501241b7952..8628aaff63f 100644
--- a/sys/arch/hppa64/include/rbus_machdep.h
+++ b/sys/arch/hppa64/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.4 2009/07/21 21:20:05 miod Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -18,8 +18,8 @@
  */
 
 
-#if !defined _ARCH_HPPA64_HPPA64_RBUS_MACHDEP_H_
-#define _ARCH_HPPA64_HPPA64_RBUS_MACHDEP_H_
+#if !defined _MACHINE_RBUS_MACHDEP_H_
+#define _MACHINE_RBUS_MACHDEP_H_
 
 static __inline int
 md_space_map(rbus_tag_t rbt, bus_addr_t bpa, bus_size_t size, int flags,
@@ -40,4 +40,4 @@ struct pci_attach_args;
 
 #define pccbb_attach_hook(parent, self, pa)	/* nothing */
 
-#endif /* _ARCH_HPPA64_HPPA64_RBUS_MACHDEP_H_ */
+#endif /* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/hppa64/include/signal.h b/sys/arch/hppa64/include/signal.h
index 2bc5c13a0b6..baaf5902d46 100644
--- a/sys/arch/hppa64/include/signal.h
+++ b/sys/arch/hppa64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.3 2006/01/08 14:20:17 millert Exp $	*/
+/*	$OpenBSD: signal.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -23,8 +23,8 @@
  * 	Utah $Hdr: signal.h 1.3 94/12/16$
  */
 
-#ifndef	_HPPA64_SIGNAL_H_
-#define	_HPPA64_SIGNAL_H_
+#ifndef	_MACHINE_SIGNAL_H_
+#define	_MACHINE_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -58,4 +58,4 @@ struct	sigcontext {
 	unsigned long	sc_fpregs[64];
 };
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif  /* !_HPPA64_SIGNAL_H_ */
+#endif  /* !_MACHINE_SIGNAL_H_ */