summaryrefslogtreecommitdiff
path: root/sys/arch/m88k
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/m88k')
-rw-r--r--sys/arch/m88k/include/asm.h8
-rw-r--r--sys/arch/m88k/include/asm_macro.h8
-rw-r--r--sys/arch/m88k/include/atomic.h8
-rw-r--r--sys/arch/m88k/include/cdefs.h8
-rw-r--r--sys/arch/m88k/include/cpu.h8
-rw-r--r--sys/arch/m88k/include/db_machdep.h6
-rw-r--r--sys/arch/m88k/include/endian.h8
-rw-r--r--sys/arch/m88k/include/exec.h8
-rw-r--r--sys/arch/m88k/include/float.h8
-rw-r--r--sys/arch/m88k/include/internal_types.h6
-rw-r--r--sys/arch/m88k/include/limits.h8
-rw-r--r--sys/arch/m88k/include/m88100.h8
-rw-r--r--sys/arch/m88k/include/m8820x.h8
-rw-r--r--sys/arch/m88k/include/mmu.h8
-rw-r--r--sys/arch/m88k/include/mplock.h6
-rw-r--r--sys/arch/m88k/include/pmap_table.h8
-rw-r--r--sys/arch/m88k/include/proc.h8
-rw-r--r--sys/arch/m88k/include/profile.h8
-rw-r--r--sys/arch/m88k/include/psl.h8
-rw-r--r--sys/arch/m88k/include/ptrace.h8
-rw-r--r--sys/arch/m88k/include/setjmp.h8
-rw-r--r--sys/arch/m88k/include/signal.h8
-rw-r--r--sys/arch/m88k/include/stdarg.h8
-rw-r--r--sys/arch/m88k/include/trap.h8
24 files changed, 93 insertions, 93 deletions
diff --git a/sys/arch/m88k/include/asm.h b/sys/arch/m88k/include/asm.h
index 25ca003130d..627f940625b 100644
--- a/sys/arch/m88k/include/asm.h
+++ b/sys/arch/m88k/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.9 2007/12/02 21:24:21 miod Exp $ */
+/* $OpenBSD: asm.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Mach Operating System
@@ -27,8 +27,8 @@
* rights to redistribute these changes.
*/
-#ifndef __M88K_ASM_H__
-#define __M88K_ASM_H__
+#ifndef _M88K_ASM_H_
+#define _M88K_ASM_H_
#ifdef __STDC__
#define _C_LABEL(name) _ ## name
@@ -197,4 +197,4 @@
#endif /* _KERNEL */
-#endif /* __M88K_ASM_H__ */
+#endif /* _M88K_ASM_H_ */
diff --git a/sys/arch/m88k/include/asm_macro.h b/sys/arch/m88k/include/asm_macro.h
index b0599eb2922..5678acfbef6 100644
--- a/sys/arch/m88k/include/asm_macro.h
+++ b/sys/arch/m88k/include/asm_macro.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm_macro.h,v 1.6 2007/12/20 21:19:34 miod Exp $ */
+/* $OpenBSD: asm_macro.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Mach Operating System
* Copyright (c) 1993-1991 Carnegie Mellon University
@@ -26,8 +26,8 @@
* rights to redistribute these changes.
*/
-#ifndef __M88K_ASM_MACRO_H__
-#define __M88K_ASM_MACRO_H__
+#ifndef _M88K_ASM_MACRO_H_
+#define _M88K_ASM_MACRO_H_
/*
* Various compiler macros used for speed and efficiency.
@@ -75,4 +75,4 @@ static __inline__ u_int get_cpu_pid(void)
return (pid);
}
-#endif /* __M88K_ASM_MACRO_H__ */
+#endif /* _M88K_ASM_MACRO_H_ */
diff --git a/sys/arch/m88k/include/atomic.h b/sys/arch/m88k/include/atomic.h
index 86b6edec9da..a2ef2187ce3 100644
--- a/sys/arch/m88k/include/atomic.h
+++ b/sys/arch/m88k/include/atomic.h
@@ -1,9 +1,9 @@
-/* $OpenBSD: atomic.h,v 1.7 2009/03/04 19:37:14 miod Exp $ */
+/* $OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $ */
/* Public Domain */
-#ifndef __M88K_ATOMIC_H__
-#define __M88K_ATOMIC_H__
+#ifndef _M88K_ATOMIC_H_
+#define _M88K_ATOMIC_H_
#if defined(_KERNEL)
@@ -54,4 +54,4 @@ atomic_clear_int(__volatile unsigned int *uip)
}
#endif /* defined(_KERNEL) */
-#endif /* __M88K_ATOMIC_H__ */
+#endif /* _M88K_ATOMIC_H_ */
diff --git a/sys/arch/m88k/include/cdefs.h b/sys/arch/m88k/include/cdefs.h
index 21999d06ada..4e37dc269bd 100644
--- a/sys/arch/m88k/include/cdefs.h
+++ b/sys/arch/m88k/include/cdefs.h
@@ -1,12 +1,12 @@
-/* $OpenBSD: cdefs.h,v 1.3 2006/01/10 00:04:04 millert Exp $ */
+/* $OpenBSD: cdefs.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Written by J.T. Conklin <jtc@wimsey.com> 01/17/95.
* Public domain.
*/
-#ifndef __MACHINE_CDEFS_H__
-#define __MACHINE_CDEFS_H__
+#ifndef _M88K_CDEFS_H_
+#define _M88K_CDEFS_H_
#if defined(lint)
#define __indr_reference(sym,alias) __lint_equal__(sym,alias)
@@ -23,4 +23,4 @@
__asm__(".weak _" #alias "; _" #alias "= _" __STRING(sym))
#endif
-#endif /* __MACHINE_CDEFS_H__ */
+#endif /* _M88K_CDEFS_H_ */
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index e14afe7f851..17d4b974df1 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.52 2011/01/05 22:16:14 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.53 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1992, 1993
@@ -38,8 +38,8 @@
* SUCH DAMAGE.
*/
-#ifndef __M88K_CPU_H__
-#define __M88K_CPU_H__
+#ifndef _M88K_CPU_H_
+#define _M88K_CPU_H_
/*
* CTL_MACHDEP definitions.
@@ -286,4 +286,4 @@ void set_vbr(register_t);
extern register_t kernel_vbr;
#endif /* _KERNEL */
-#endif /* __M88K_CPU_H__ */
+#endif /* _M88K_CPU_H_ */
diff --git a/sys/arch/m88k/include/db_machdep.h b/sys/arch/m88k/include/db_machdep.h
index e8c7b74297c..8e5e9be47d9 100644
--- a/sys/arch/m88k/include/db_machdep.h
+++ b/sys/arch/m88k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.14 2010/11/27 19:57:23 miod Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Mach Operating System
* Copyright (c) 1993-1991 Carnegie Mellon University
@@ -26,8 +26,8 @@
* rights to redistribute these changes.
*/
-#ifndef _M88K_DB_MACHDEP_H_
-#define _M88K_DB_MACHDEP_H_
+#ifndef _M88K_DB_MACHDEP_H_
+#define _M88K_DB_MACHDEP_H_
/* trap numbers used by ddb */
#define DDB_ENTRY_BKPT_NO 130
diff --git a/sys/arch/m88k/include/endian.h b/sys/arch/m88k/include/endian.h
index 8cc0485cbea..0a2c32e80f0 100644
--- a/sys/arch/m88k/include/endian.h
+++ b/sys/arch/m88k/include/endian.h
@@ -1,4 +1,4 @@
-/* $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:35 pirofti Exp $ */
/*-
* Copyright (c) 1997 Niklas Hallqvist. All rights reserved.
@@ -24,13 +24,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MACHINE_ENDIAN_H__
-#define __MACHINE_ENDIAN_H__
+#ifndef _M88K_ENDIAN_H_
+#define _M88K_ENDIAN_H_
#define _BYTE_ORDER _BIG_ENDIAN
#include <sys/endian.h>
#define __STRICT_ALIGNMENT
-#endif /* __MACHINE_ENDIAN_H__ */
+#endif /* _M88K_ENDIAN_H_ */
diff --git a/sys/arch/m88k/include/exec.h b/sys/arch/m88k/include/exec.h
index 2b6a3f6e321..e4f45a2427e 100644
--- a/sys/arch/m88k/include/exec.h
+++ b/sys/arch/m88k/include/exec.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: exec.h,v 1.1 2004/04/26 12:34:05 miod Exp $ */
-#ifndef __MACHINE_EXEC_H__
-#define __MACHINE_EXEC_H__
+/* $OpenBSD: exec.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
+#ifndef _M88K_EXEC_H_
+#define _M88K_EXEC_H_
#define __LDPGSZ 4096
@@ -29,4 +29,4 @@ struct relocation_info_m88k {
#define _KERN_DO_AOUT
#define _KERN_DO_ELF
-#endif /* __MACHINE_EXEC_H__ */
+#endif /* _M88K_EXEC_H_ */
diff --git a/sys/arch/m88k/include/float.h b/sys/arch/m88k/include/float.h
index 8e46928dafb..cd903f51969 100644
--- a/sys/arch/m88k/include/float.h
+++ b/sys/arch/m88k/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.3 2008/09/07 20:36:06 martynas Exp $ */
+/* $OpenBSD: float.h,v 1.4 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 __M88K_FLOAT_H__
-#define __M88K_FLOAT_H__
+#ifndef _M88K_FLOAT_H_
+#define _M88K_FLOAT_H_
#include <sys/cdefs.h>
@@ -74,4 +74,4 @@ __END_DECLS
#define LDBL_MAX 1.18973149535723176502e+4932L
#define LDBL_MAX_10_EXP 4932
-#endif /* __M88K_FLOAT_H__ */
+#endif /* _M88K_FLOAT_H_ */
diff --git a/sys/arch/m88k/include/internal_types.h b/sys/arch/m88k/include/internal_types.h
index adcc8987a47..bc3cf703766 100644
--- a/sys/arch/m88k/include/internal_types.h
+++ b/sys/arch/m88k/include/internal_types.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: internal_types.h,v 1.1 2004/04/26 12:34:05 miod 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 _M88K_INTERNAL_TYPES_H_
+#define _M88K_INTERNAL_TYPES_H_
#endif
diff --git a/sys/arch/m88k/include/limits.h b/sys/arch/m88k/include/limits.h
index e650c2f04db..89735c1dbea 100644
--- a/sys/arch/m88k/include/limits.h
+++ b/sys/arch/m88k/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:35 pirofti Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -30,8 +30,8 @@
* from: @(#)limits.h 8.3 (Berkeley) 1/4/94
*/
-#ifndef _MACHINE_LIMITS_H_
-#define _MACHINE_LIMITS_H_
+#ifndef _M88K_LIMITS_H_
+#define _M88K_LIMITS_H_
#include <sys/cdefs.h>
@@ -52,4 +52,4 @@
#define QUAD_MIN (-QUAD_MAX-1) /* min value for a quad_t */
#endif /* __BSD_VISIBLE */
-#endif /* _MACHINE_LIMITS_H_ */
+#endif /* _M88K_LIMITS_H_ */
diff --git a/sys/arch/m88k/include/m88100.h b/sys/arch/m88k/include/m88100.h
index 245e2af244f..82b6be45b3c 100644
--- a/sys/arch/m88k/include/m88100.h
+++ b/sys/arch/m88k/include/m88100.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88100.h,v 1.5 2009/02/21 18:37:47 miod Exp $ */
+/* $OpenBSD: m88100.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Mach Operating System
* Copyright (c) 1993-1992 Carnegie Mellon University
@@ -25,8 +25,8 @@
* the rights to redistribute these changes.
*/
-#ifndef __M88K_M88100_H__
-#define __M88K_M88100_H__
+#ifndef _M88K_M88100_H_
+#define _M88K_M88100_H_
/*
* 88100 RISC definitions
@@ -75,4 +75,4 @@ void m88100_smp_setup(struct cpu_info *);
#endif
-#endif /* __M88K_M88100_H__ */
+#endif /* _M88K_M88100_H_ */
diff --git a/sys/arch/m88k/include/m8820x.h b/sys/arch/m88k/include/m8820x.h
index efb1f28a70e..45eaaca75c3 100644
--- a/sys/arch/m88k/include/m8820x.h
+++ b/sys/arch/m88k/include/m8820x.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: m8820x.h,v 1.8 2010/04/18 22:04:39 miod Exp $ */
+/* $OpenBSD: m8820x.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
*
@@ -49,8 +49,8 @@
* the rights to redistribute these changes.
*/
-#ifndef __M88K_M8820X_H__
-#define __M88K_M8820X_H__
+#ifndef _M88K_M8820X_H_
+#define _M88K_M8820X_H_
/*
* 8820x CMMU definitions
@@ -211,4 +211,4 @@ void m8820x_setup_board_config(void);
cpuid_t m8820x_cpu_number(void);
#endif /* _LOCORE */
-#endif /* __M88K_M8820X_H__ */
+#endif /* _M88K_M8820X_H_ */
diff --git a/sys/arch/m88k/include/mmu.h b/sys/arch/m88k/include/mmu.h
index a6122d8f005..5293d7a40ef 100644
--- a/sys/arch/m88k/include/mmu.h
+++ b/sys/arch/m88k/include/mmu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mmu.h,v 1.11 2007/11/21 21:45:47 miod Exp $ */
+/* $OpenBSD: mmu.h,v 1.12 2011/03/23 16:54:35 pirofti Exp $ */
/*
* This file bears almost no resemblance to the original m68k file,
@@ -44,8 +44,8 @@
* @(#)pte.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MACHINE_MMU_H_
-#define _MACHINE_MMU_H_
+#ifndef _M88K_MMU_H_
+#define _M88K_MMU_H_
/*
* Parameters which determine the 'geometry' of the m88K page tables in memory.
@@ -216,4 +216,4 @@ invalidate_pte(pt_entry_t *pte)
return oldpte;
}
-#endif /* __MACHINE_MMU_H__ */
+#endif /* __M88K_MMU_H__ */
diff --git a/sys/arch/m88k/include/mplock.h b/sys/arch/m88k/include/mplock.h
index 94ffede4ac1..8b9e828bd99 100644
--- a/sys/arch/m88k/include/mplock.h
+++ b/sys/arch/m88k/include/mplock.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mplock.h,v 1.1 2007/12/02 21:20:17 miod Exp $ */
+/* $OpenBSD: mplock.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Copyright (c) 2004 Niklas Hallqvist. All rights reserved.
@@ -24,8 +24,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _MACHINE_MPLOCK_H_
-#define _MACHINE_MPLOCK_H_
+#ifndef _M88K_MPLOCK_H_
+#define _M88K_MPLOCK_H_
#ifndef _LOCORE
diff --git a/sys/arch/m88k/include/pmap_table.h b/sys/arch/m88k/include/pmap_table.h
index 6f5944e7612..b44097ae7b2 100644
--- a/sys/arch/m88k/include/pmap_table.h
+++ b/sys/arch/m88k/include/pmap_table.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_table.h,v 1.3 2011/01/02 13:40:07 miod Exp $ */
+/* $OpenBSD: pmap_table.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Mach Operating System
* Copyright (c) 1992 Carnegie Mellon University
@@ -25,8 +25,8 @@
* the rights to redistribute these changes.
*/
-#ifndef __M88K_PMAP_TABLE_H__
-#define __M88K_PMAP_TABLE_H__
+#ifndef _M88K_PMAP_TABLE_H_
+#define _M88K_PMAP_TABLE_H_
/*
* Built-in mappings list.
@@ -42,4 +42,4 @@ struct pmap_table {
const struct pmap_table *pmap_table_build(void);
-#endif /* __M88K_PMAP_TABLE_H__ */
+#endif /* _M88K_PMAP_TABLE_H_ */
diff --git a/sys/arch/m88k/include/proc.h b/sys/arch/m88k/include/proc.h
index dd71a085a1c..95d041da92a 100644
--- a/sys/arch/m88k/include/proc.h
+++ b/sys/arch/m88k/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.4 2005/11/28 22:21:15 miod Exp $ */
+/* $OpenBSD: proc.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,8 +41,8 @@
* from: Header: proc.h,v 1.6 92/11/26 02:04:41 torek Exp (LBL)
*/
-#ifndef __MACHINE_PROC_H__
-#define __MACHINE_PROC_H__
+#ifndef _M88K_PROC_H_
+#define _M88K_PROC_H_
struct trapframe;
@@ -67,4 +67,4 @@ struct mdproc {
u_int md_bp1save;
};
-#endif /* __MACHINE_PROC_H__ */
+#endif /* _M88K_PROC_H_ */
diff --git a/sys/arch/m88k/include/profile.h b/sys/arch/m88k/include/profile.h
index 6d22d78f6ea..0b625f3ebe9 100644
--- a/sys/arch/m88k/include/profile.h
+++ b/sys/arch/m88k/include/profile.h
@@ -1,6 +1,6 @@
-#ifndef __M88K_PROFILE_H__
-#define __M88K_PROFILE_H__
-/* $OpenBSD: profile.h,v 1.4 2007/12/20 21:19:34 miod Exp $ */
+#ifndef _M88K_PROFILE_H_
+#define _M88K_PROFILE_H_
+/* $OpenBSD: profile.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
*
@@ -49,4 +49,4 @@ mcount() \
#define MCOUNT_EXIT set_psr(s)
#endif /* _KERNEL */
-#endif /* __M88K_PROFILE_H__ */
+#endif /* _M88K_PROFILE_H_ */
diff --git a/sys/arch/m88k/include/psl.h b/sys/arch/m88k/include/psl.h
index a03dfa2ddd5..ee9d4da0d81 100644
--- a/sys/arch/m88k/include/psl.h
+++ b/sys/arch/m88k/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.6 2008/07/28 17:50:09 miod Exp $ */
+/* $OpenBSD: psl.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* All rights reserved.
@@ -43,8 +43,8 @@
*
*/
-#ifndef __M88K_PSL_H__
-#define __M88K_PSL_H__
+#ifndef _M88K_PSL_H_
+#define _M88K_PSL_H_
/*
* 881x0 control registers
@@ -93,4 +93,4 @@
#define XIP_E 0x00000001 /* exception */
#define XIP_ADDR 0xfffffffc /* address mask */
-#endif /* __M88K_PSL_H__ */
+#endif /* _M88K_PSL_H_ */
diff --git a/sys/arch/m88k/include/ptrace.h b/sys/arch/m88k/include/ptrace.h
index f258f2fff90..53ed9659e00 100644
--- a/sys/arch/m88k/include/ptrace.h
+++ b/sys/arch/m88k/include/ptrace.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ptrace.h,v 1.3 2005/05/18 16:44:37 miod Exp $ */
+/* $OpenBSD: ptrace.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Copyright (c) 1999, Steve Murphree, Jr.
* Copyright (c) 1992, 1993
@@ -46,11 +46,11 @@
* m88k-dependent ptrace definitions.
*/
-#ifndef __MACHINE_PTRACE_H__
-#define __MACHINE_PTRACE_H__
+#ifndef _M88K_PTRACE_H_
+#define _M88K_PTRACE_H_
#define PT_STEP (PT_FIRSTMACH + 0)
#define PT_GETREGS (PT_FIRSTMACH + 1)
#define PT_SETREGS (PT_FIRSTMACH + 2)
-#endif /* __MACHINE_PTRACE_H__ */
+#endif /* _M88K_PTRACE_H_ */
diff --git a/sys/arch/m88k/include/setjmp.h b/sys/arch/m88k/include/setjmp.h
index 397c27d8ee9..c38e9500322 100644
--- a/sys/arch/m88k/include/setjmp.h
+++ b/sys/arch/m88k/include/setjmp.h
@@ -1,9 +1,9 @@
-/* $OpenBSD: setjmp.h,v 1.1 2004/04/26 12:34:05 miod Exp $ */
+/* $OpenBSD: setjmp.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
/*
* machine/setjmp.h: machine dependent setjmp-related information.
*/
-#ifndef __MACHINE_SETJMP_H__
-#define __MACHINE_SETJMP_H__
+#ifndef _M88K_SETJMP_H_
+#define _M88K_SETJMP_H_
#define _JBLEN 21 /* size, in longs, of a jmp_buf */
-#endif /* __MACHINE_SETJMP_H__ */
+#endif /* _M88K_SETJMP_H_ */
diff --git a/sys/arch/m88k/include/signal.h b/sys/arch/m88k/include/signal.h
index 798c75a148d..ef4dfed462b 100644
--- a/sys/arch/m88k/include/signal.h
+++ b/sys/arch/m88k/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.4 2006/01/09 23:53:41 millert Exp $ */
+/* $OpenBSD: signal.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* All rights reserved.
@@ -30,8 +30,8 @@
*
*/
-#ifndef __MACHINE_SIGNAL_H__
-#define __MACHINE_SIGNAL_H__
+#ifndef _M88K_SIGNAL_H_
+#define _M88K_SIGNAL_H_
#include <sys/cdefs.h>
@@ -56,4 +56,4 @@ struct sigcontext {
struct reg sc_regs;
};
#endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif /* __MACHINE_SIGNAL_H__ */
+#endif /* _M88K_SIGNAL_H_ */
diff --git a/sys/arch/m88k/include/stdarg.h b/sys/arch/m88k/include/stdarg.h
index 1b42ef6d009..63b13410656 100644
--- a/sys/arch/m88k/include/stdarg.h
+++ b/sys/arch/m88k/include/stdarg.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: stdarg.h,v 1.2 2006/01/06 18:53:05 millert Exp $ */
+/* $OpenBSD: stdarg.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $ */
-#ifndef _M88K_STDARGS_H_
-#define _M88K_STDARGS_H_
+#ifndef _M88K_STDARG_H_
+#define _M88K_STDARG_H_
#include <machine/_types.h>
@@ -13,4 +13,4 @@
typedef __va_list va_list;
-#endif /* _M88K_STDARGS_H_ */
+#endif /* _M88K_STDARG_H_ */
diff --git a/sys/arch/m88k/include/trap.h b/sys/arch/m88k/include/trap.h
index 642b447d1b6..2012ee1c244 100644
--- a/sys/arch/m88k/include/trap.h
+++ b/sys/arch/m88k/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.9 2009/03/01 17:43:23 miod Exp $ */
+/* $OpenBSD: trap.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $ */
/*
* Mach Operating System
* Copyright (c) 1992 Carnegie Mellon University
@@ -27,8 +27,8 @@
/*
* Trap codes
*/
-#ifndef __M88K_TRAP_H__
-#define __M88K_TRAP_H__
+#ifndef _M88K_TRAP_H_
+#define _M88K_TRAP_H_
/*
* Trap type values
@@ -72,4 +72,4 @@ void m88110_fpu_exception(struct trapframe *);
#endif /* _LOCORE */
-#endif /* __M88K_TRAP_H__ */
+#endif /* _M88K_TRAP_H_ */