summaryrefslogtreecommitdiff
path: root/sys/arch/mips64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/mips64')
-rw-r--r--sys/arch/mips64/include/archtype.h8
-rw-r--r--sys/arch/mips64/include/asm.h8
-rw-r--r--sys/arch/mips64/include/atomic.h8
-rw-r--r--sys/arch/mips64/include/cdefs.h8
-rw-r--r--sys/arch/mips64/include/cpu.h8
-rw-r--r--sys/arch/mips64/include/db_machdep.h8
-rw-r--r--sys/arch/mips64/include/endian.h8
-rw-r--r--sys/arch/mips64/include/float.h8
-rw-r--r--sys/arch/mips64/include/ieeefp.h8
-rw-r--r--sys/arch/mips64/include/kcore.h8
-rw-r--r--sys/arch/mips64/include/limits.h8
-rw-r--r--sys/arch/mips64/include/loongson2.h8
-rw-r--r--sys/arch/mips64/include/memconf.h8
-rw-r--r--sys/arch/mips64/include/mips_opcode.h8
-rw-r--r--sys/arch/mips64/include/param.h8
-rw-r--r--sys/arch/mips64/include/pcb.h8
-rw-r--r--sys/arch/mips64/include/pmap.h8
-rw-r--r--sys/arch/mips64/include/proc.h8
-rw-r--r--sys/arch/mips64/include/profile.h8
-rw-r--r--sys/arch/mips64/include/ptrace.h8
-rw-r--r--sys/arch/mips64/include/reg.h8
-rw-r--r--sys/arch/mips64/include/regdef.h8
-rw-r--r--sys/arch/mips64/include/setjmp.h8
-rw-r--r--sys/arch/mips64/include/signal.h8
-rw-r--r--sys/arch/mips64/include/spinlock.h8
-rw-r--r--sys/arch/mips64/include/stdarg.h12
-rw-r--r--sys/arch/mips64/include/trap.h8
-rw-r--r--sys/arch/mips64/include/varargs.h8
-rw-r--r--sys/arch/mips64/include/vmparam.h8
29 files changed, 118 insertions, 118 deletions
diff --git a/sys/arch/mips64/include/archtype.h b/sys/arch/mips64/include/archtype.h
index e2b7accef0d..907c413e268 100644
--- a/sys/arch/mips64/include/archtype.h
+++ b/sys/arch/mips64/include/archtype.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archtype.h,v 1.12 2010/05/08 21:59:56 miod Exp $ */
+/* $OpenBSD: archtype.h,v 1.13 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1997-2004 Opsycon AB, Sweden (www.opsycon.se)
*
@@ -25,8 +25,8 @@
*
*/
-#ifndef _MIPS_ARCHTYPE_H_
-#define _MIPS_ARCHTYPE_H_
+#ifndef _MIPS64_ARCHTYPE_H_
+#define _MIPS64_ARCHTYPE_H_
/*
* Define architectural identities for the different Mips machines.
*/
@@ -89,4 +89,4 @@
#define ARCHCLASS(n) ((n) & 0xf0)
-#endif /* !_MIPS_ARCHTYPE_H_ */
+#endif /* !_MIPS64_ARCHTYPE_H_ */
diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h
index 5fb4f23b98b..65289dcaf37 100644
--- a/sys/arch/mips64/include/asm.h
+++ b/sys/arch/mips64/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.13 2010/10/01 05:02:19 guenther Exp $ */
+/* $OpenBSD: asm.h,v 1.14 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -25,8 +25,8 @@
* SUCH DAMAGE.
*
*/
-#ifndef _MIPS64_ASM_H
-#define _MIPS64_ASM_H
+#ifndef _MIPS64_ASM_H_
+#define _MIPS64_ASM_H_
#include <machine/regdef.h>
@@ -311,4 +311,4 @@ x: ; \
LA ci, cpu_info_primary
#endif /* MULTIPROCESSOR */
-#endif /* !_MIPS_ASM_H */
+#endif /* !_MIPS64_ASM_H_ */
diff --git a/sys/arch/mips64/include/atomic.h b/sys/arch/mips64/include/atomic.h
index 7731a67baaa..467a2ada83a 100644
--- a/sys/arch/mips64/include/atomic.h
+++ b/sys/arch/mips64/include/atomic.h
@@ -1,9 +1,9 @@
-/* $OpenBSD: atomic.h,v 1.6 2009/12/28 06:55:27 syuu Exp $ */
+/* $OpenBSD: atomic.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $ */
/* Public Domain */
-#ifndef __MIPS64_ATOMIC_H__
-#define __MIPS64_ATOMIC_H__
+#ifndef _MIPS64_ATOMIC_H_
+#define _MIPS64_ATOMIC_H_
#if defined(_KERNEL)
@@ -84,4 +84,4 @@ atomic_add_uint64(__volatile uint64_t *uip, uint64_t v)
"r"(uip), "r"(v) : "memory");
}
#endif /* defined(_KERNEL) */
-#endif /* __MIPS64_ATOMIC_H__ */
+#endif /* _MIPS64_ATOMIC_H_ */
diff --git a/sys/arch/mips64/include/cdefs.h b/sys/arch/mips64/include/cdefs.h
index d52376ae167..d2db0bc7aee 100644
--- a/sys/arch/mips64/include/cdefs.h
+++ b/sys/arch/mips64/include/cdefs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdefs.h,v 1.4 2006/01/10 00:04:04 millert Exp $ */
+/* $OpenBSD: cdefs.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -27,8 +27,8 @@
*/
-#ifndef _MIPS_CDEFS_H_
-#define _MIPS_CDEFS_H_
+#ifndef _MIPS64_CDEFS_H_
+#define _MIPS64_CDEFS_H_
#if defined(lint)
#define __indr_reference(sym,alias) __lint_equal__(sym,alias)
@@ -44,4 +44,4 @@
#define __indr_references(sym,msg) /* nothing */
#endif
-#endif /* !_MIPS_CDEFS_H_ */
+#endif /* !_MIPS64_CDEFS_H_ */
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index 2ef12590d9d..3438add409e 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.69 2010/11/24 21:16:26 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.70 2011/03/23 16:54:36 pirofti Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -42,8 +42,8 @@
* from: @(#)cpu.h 8.4 (Berkeley) 1/4/94
*/
-#ifndef _MIPS_CPU_H_
-#define _MIPS_CPU_H_
+#ifndef _MIPS64_CPU_H_
+#define _MIPS64_CPU_H_
#ifndef _LOCORE
@@ -635,4 +635,4 @@ uint32_t getsr(void);
uint32_t setsr(uint32_t);
#endif /* _KERNEL && !_LOCORE */
-#endif /* !_MIPS_CPU_H_ */
+#endif /* !_MIPS64_CPU_H_ */
diff --git a/sys/arch/mips64/include/db_machdep.h b/sys/arch/mips64/include/db_machdep.h
index 26f2d9f4371..2ddf903fb32 100644
--- a/sys/arch/mips64/include/db_machdep.h
+++ b/sys/arch/mips64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.11 2010/11/27 19:57:23 miod Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.12 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -26,8 +26,8 @@
*
*/
-#ifndef _MIPS_DB_MACHDEP_H_
-#define _MIPS_DB_MACHDEP_H_
+#ifndef _MIPS64_DB_MACHDEP_H_
+#define _MIPS64_DB_MACHDEP_H_
#include <machine/frame.h>
#include <machine/trap.h>
@@ -82,4 +82,4 @@ extern struct mutex ddb_mp_mutex;
#define DDB_STATE_RUNNING 1
#define DDB_STATE_EXITING 2
-#endif /* !_MIPS_DB_MACHDEP_H_ */
+#endif /* !_MIPS64_DB_MACHDEP_H_ */
diff --git a/sys/arch/mips64/include/endian.h b/sys/arch/mips64/include/endian.h
index 093c0bc100e..71d0554ec60 100644
--- a/sys/arch/mips64/include/endian.h
+++ b/sys/arch/mips64/include/endian.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: endian.h,v 1.6 2011/03/11 15:17:08 pirofti Exp $ */
+/* $OpenBSD: endian.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 2001-2002 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -26,8 +26,8 @@
*
*/
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _MIPS64_ENDIAN_H_
+#define _MIPS64_ENDIAN_H_
#if defined(__MIPSEL__)
#define _BYTE_ORDER _LITTLE_ENDIAN
@@ -44,4 +44,4 @@
#define __STRICT_ALIGNMENT
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* _MIPS64_ENDIAN_H_ */
diff --git a/sys/arch/mips64/include/float.h b/sys/arch/mips64/include/float.h
index 4764dfea4a9..3e9c05ada9e 100644
--- a/sys/arch/mips64/include/float.h
+++ b/sys/arch/mips64/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.6 2010/07/17 17:52:43 miod Exp $ */
+/* $OpenBSD: float.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -31,8 +31,8 @@
* @(#)float.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_FLOAT_H_
-#define _MIPS_FLOAT_H_
+#ifndef _MIPS64_FLOAT_H_
+#define _MIPS64_FLOAT_H_
#include <sys/cdefs.h>
@@ -74,4 +74,4 @@ __END_DECLS
#define LDBL_MAX 1.18973149535723176508575932662800702e+4932L
#define LDBL_MAX_10_EXP 4932
-#endif /* !_MIPS_FLOAT_H_ */
+#endif /* !_MIPS64_FLOAT_H_ */
diff --git a/sys/arch/mips64/include/ieeefp.h b/sys/arch/mips64/include/ieeefp.h
index 0c2f18909b5..f3dbac462b2 100644
--- a/sys/arch/mips64/include/ieeefp.h
+++ b/sys/arch/mips64/include/ieeefp.h
@@ -1,12 +1,12 @@
-/* $OpenBSD: ieeefp.h,v 1.3 2010/09/21 20:29:17 miod Exp $ */
+/* $OpenBSD: ieeefp.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Written by J.T. Conklin, Apr 11, 1995
* Public domain.
*/
-#ifndef _MIPS_IEEEFP_H_
-#define _MIPS_IEEEFP_H_
+#ifndef _MIPS64_IEEEFP_H_
+#define _MIPS64_IEEEFP_H_
typedef int fp_except;
#define FP_X_IMP 0x01 /* imprecise (loss of precision) */
@@ -43,4 +43,4 @@ typedef enum {
#endif
-#endif /* !_MIPS_IEEEFP_H_ */
+#endif /* !_MIPS64_IEEEFP_H_ */
diff --git a/sys/arch/mips64/include/kcore.h b/sys/arch/mips64/include/kcore.h
index b7449467a60..e88cb0e5fe3 100644
--- a/sys/arch/mips64/include/kcore.h
+++ b/sys/arch/mips64/include/kcore.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kcore.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */
+/* $OpenBSD: kcore.h,v 1.2 2011/03/23 16:54:36 pirofti Exp $ */
/* $NetBSD: kcore.h,v 1.1 1996/03/10 21:55:18 leo Exp $ */
/*
@@ -31,8 +31,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _MIPS_KCORE_H_
-#define _MIPS_KCORE_H_
+#ifndef _MIPS64_KCORE_H_
+#define _MIPS64_KCORE_H_
#define NPHYS_RAM_SEGS 8
@@ -42,4 +42,4 @@ typedef struct cpu_kcore_hdr {
phys_ram_seg_t ram_segs[NPHYS_RAM_SEGS];
} cpu_kcore_hdr_t;
-#endif /* !_MIPS_KCORE_H_ */
+#endif /* !_MIPS64_KCORE_H_ */
diff --git a/sys/arch/mips64/include/limits.h b/sys/arch/mips64/include/limits.h
index 71e839360f6..cdb6d60a9b1 100644
--- a/sys/arch/mips64/include/limits.h
+++ b/sys/arch/mips64/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.6 2009/11/27 19:54:35 guenther Exp $ */
+/* $OpenBSD: limits.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -31,8 +31,8 @@
* @(#)limits.h 8.3 (Berkeley) 1/4/94
*/
-#ifndef _MIPS_LIMITS_H_
-#define _MIPS_LIMITS_H_
+#ifndef _MIPS64_LIMITS_H_
+#define _MIPS64_LIMITS_H_
#include <sys/cdefs.h>
@@ -53,4 +53,4 @@
#endif /* __BSD_VISIBLE */
-#endif /* !_MIPS_LIMITS_H_ */
+#endif /* !_MIPS64_LIMITS_H_ */
diff --git a/sys/arch/mips64/include/loongson2.h b/sys/arch/mips64/include/loongson2.h
index a5e4a032e7b..1561b19cbc2 100644
--- a/sys/arch/mips64/include/loongson2.h
+++ b/sys/arch/mips64/include/loongson2.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: loongson2.h,v 1.2 2010/01/28 21:24:08 miod Exp $ */
+/* $OpenBSD: loongson2.h,v 1.3 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 _MACHINE_LOONGSON2_H_
-#define _MACHINE_LOONGSON2_H_
+#ifndef _MIPS64_LOONGSON2_H_
+#define _MIPS64_LOONGSON2_H_
/*
* Loongson 2E/2F specific defines
@@ -57,4 +57,4 @@
#define COP_0_DIAG_BTB_CLEAR 0x02
#define COP_0_DIAG_RAS_DISABLE 0x01
-#endif /* _MACHINE_LOONGSON2_H_ */
+#endif /* _MIPS64_LOONGSON2_H_ */
diff --git a/sys/arch/mips64/include/memconf.h b/sys/arch/mips64/include/memconf.h
index cb9c3c9cdac..9373abfa51b 100644
--- a/sys/arch/mips64/include/memconf.h
+++ b/sys/arch/mips64/include/memconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: memconf.h,v 1.5 2009/11/19 06:06:49 miod Exp $ */
+/* $OpenBSD: memconf.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1996 Per Fogelstrom
@@ -29,8 +29,8 @@
* Memory config list used by pmap_bootstrap.
*/
-#ifndef _MIPS_MEMCONF_H_
-#define _MIPS_MEMCONF_H_
+#ifndef _MIPS64_MEMCONF_H_
+#define _MIPS64_MEMCONF_H_
struct phys_mem_desc {
uint64_t mem_first_page;
@@ -46,4 +46,4 @@ extern struct phys_mem_desc mem_layout[];
int memrange_register(uint64_t, uint64_t, uint64_t, unsigned int);
#endif
-#endif /* !_MIPS_MEMCONF_H_ */
+#endif /* !_MIPS64_MEMCONF_H_ */
diff --git a/sys/arch/mips64/include/mips_opcode.h b/sys/arch/mips64/include/mips_opcode.h
index 6c324c10efa..fadd9c972b0 100644
--- a/sys/arch/mips64/include/mips_opcode.h
+++ b/sys/arch/mips64/include/mips_opcode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mips_opcode.h,v 1.5 2010/09/19 23:34:33 miod Exp $ */
+/* $OpenBSD: mips_opcode.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
* from: @(#)mips_opcode.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_MIPS_OPCODE_H_
-#define _MIPS_MIPS_OPCODE_H_
+#ifndef _MIPS64_MIPS_OPCODE_H_
+#define _MIPS64_MIPS_OPCODE_H_
/*
* Define the instruction formats and opcode values for the
@@ -336,4 +336,4 @@ typedef union {
#define OP_NMADD 06
#define OP_NMSUB 07
-#endif /* !_MIPS_MIPS_OPCODE_H_ */
+#endif /* !_MIPS64_MIPS_OPCODE_H_ */
diff --git a/sys/arch/mips64/include/param.h b/sys/arch/mips64/include/param.h
index c0570edd533..c1276defcf6 100644
--- a/sys/arch/mips64/include/param.h
+++ b/sys/arch/mips64/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.27 2010/11/28 20:35:15 miod Exp $ */
+/* $OpenBSD: param.h,v 1.28 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -37,8 +37,8 @@
* from: @(#)param.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_PARAM_H_
-#define _MIPS_PARAM_H_
+#ifndef _MIPS64_PARAM_H_
+#define _MIPS64_PARAM_H_
#ifdef _KERNEL
#include <machine/cpu.h>
@@ -109,4 +109,4 @@ void delay(int);
#endif
#endif /* _KERNEL */
-#endif /* !_MIPS_PARAM_H_ */
+#endif /* !_MIPS64_PARAM_H_ */
diff --git a/sys/arch/mips64/include/pcb.h b/sys/arch/mips64/include/pcb.h
index 18bc0dfbad7..6243b028b24 100644
--- a/sys/arch/mips64/include/pcb.h
+++ b/sys/arch/mips64/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.4 2010/02/13 14:04:45 miod Exp $ */
+/* $OpenBSD: pcb.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -37,8 +37,8 @@
* from: @(#)pcb.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_PCB_H_
-#define _MIPS_PCB_H_
+#ifndef _MIPS64_PCB_H_
+#define _MIPS64_PCB_H_
#include <machine/frame.h>
@@ -62,4 +62,4 @@ struct md_coredump {
long md_pad[8];
};
-#endif /* !_MIPS_PCB_H_ */
+#endif /* !_MIPS64_PCB_H_ */
diff --git a/sys/arch/mips64/include/pmap.h b/sys/arch/mips64/include/pmap.h
index ddc59007d3d..7c969b277db 100644
--- a/sys/arch/mips64/include/pmap.h
+++ b/sys/arch/mips64/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.24 2010/12/26 15:40:59 miod Exp $ */
+/* $OpenBSD: pmap.h,v 1.25 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@@ -35,8 +35,8 @@
* from: @(#)pmap.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_PMAP_H_
-#define _MIPS_PMAP_H_
+#ifndef _MIPS64_PMAP_H_
+#define _MIPS64_PMAP_H_
#ifdef _KERNEL
@@ -163,4 +163,4 @@ vm_page_t pmap_unmap_direct(vaddr_t);
#endif /* _KERNEL */
-#endif /* !_MIPS_PMAP_H_ */
+#endif /* !_MIPS64_PMAP_H_ */
diff --git a/sys/arch/mips64/include/proc.h b/sys/arch/mips64/include/proc.h
index f4d31e7201a..04aba12c08c 100644
--- a/sys/arch/mips64/include/proc.h
+++ b/sys/arch/mips64/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.7 2010/11/24 21:16:26 miod Exp $ */
+/* $OpenBSD: proc.h,v 1.8 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
* @(#)proc.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_PROC_H_
-#define _MIPS_PROC_H_
+#ifndef _MIPS64_PROC_H_
+#define _MIPS64_PROC_H_
/*
* Machine-dependent part of the proc structure.
@@ -77,4 +77,4 @@ struct mdproc {
#define MDP_WATCH2 0x00040000 /* Watch register 1 used */
#define MDP_FORKSAVE 0x0000ffff /* Flags to save when forking */
-#endif /* !_MIPS_PROC_H_ */
+#endif /* !_MIPS64_PROC_H_ */
diff --git a/sys/arch/mips64/include/profile.h b/sys/arch/mips64/include/profile.h
index e5dce1ed317..4b48e1c436e 100644
--- a/sys/arch/mips64/include/profile.h
+++ b/sys/arch/mips64/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.3 2009/12/11 05:10:17 miod Exp $ */
+/* $OpenBSD: profile.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -33,8 +33,8 @@
*
* from: @(#)profile.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_PROFILE_H_
-#define _MIPS_PROFILE_H_
+#ifndef _MIPS64_PROFILE_H_
+#define _MIPS64_PROFILE_H_
#define _MCOUNT_DECL static void ___mcount
@@ -81,4 +81,4 @@
#define MCOUNT_EXIT _splx(s)
#endif /* _KERNEL */
-#endif /* !_MIPS_PROFILE_H_ */
+#endif /* !_MIPS64_PROFILE_H_ */
diff --git a/sys/arch/mips64/include/ptrace.h b/sys/arch/mips64/include/ptrace.h
index a89fd596b6c..a6399a6b2fe 100644
--- a/sys/arch/mips64/include/ptrace.h
+++ b/sys/arch/mips64/include/ptrace.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ptrace.h,v 1.2 2005/08/07 07:29:44 miod Exp $ */
+/* $OpenBSD: ptrace.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -31,8 +31,8 @@
* from: @(#)ptrace.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_PTRACE_H_
-#define _MIPS_PTRACE_H_
+#ifndef _MIPS64_PTRACE_H_
+#define _MIPS64_PTRACE_H_
/*
* Machine dependent trace commands.
@@ -43,4 +43,4 @@
#define PT_SETREGS (PT_FIRSTMACH+1)
#define PT_STEP (PT_FIRSTMACH+2)
-#endif /* !_MIPS_PTRACE_H_ */
+#endif /* !_MIPS64_PTRACE_H_ */
diff --git a/sys/arch/mips64/include/reg.h b/sys/arch/mips64/include/reg.h
index 1af5bae6e3e..9a67a457ec9 100644
--- a/sys/arch/mips64/include/reg.h
+++ b/sys/arch/mips64/include/reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reg.h,v 1.2 2005/08/07 07:29:44 miod Exp $ */
+/* $OpenBSD: reg.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -37,8 +37,8 @@
* @(#)reg.h 8.2 (Berkeley) 1/11/94
*/
-#ifndef _MIPS_REG_H_
-#define _MIPS_REG_H_
+#ifndef _MIPS64_REG_H_
+#define _MIPS64_REG_H_
/*
* Location of the users' stored
* registers relative to ZERO.
@@ -54,4 +54,4 @@
struct reg {
register_t r_regs[NREGS]; /* numbered as above */
};
-#endif /* !_MIPS_REG_H_ */
+#endif /* !_MIPS64_REG_H_ */
diff --git a/sys/arch/mips64/include/regdef.h b/sys/arch/mips64/include/regdef.h
index ae18392391f..fe62f63f143 100644
--- a/sys/arch/mips64/include/regdef.h
+++ b/sys/arch/mips64/include/regdef.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: regdef.h,v 1.3 2005/08/07 07:29:44 miod Exp $ */
+/* $OpenBSD: regdef.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
*
* @(#)regdef.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_REGDEF_H_
-#define _MIPS_REGDEF_H_
+#ifndef _MIPS64_REGDEF_H_
+#define _MIPS64_REGDEF_H_
#define zero $0 /* always zero */
#define AT $at /* assembler temp */
@@ -89,4 +89,4 @@
#define s8 $30 /* one more callee saved */
#define ra $31 /* return address */
-#endif /* !_MIPS_REGDEF_H_ */
+#endif /* !_MIPS64_REGDEF_H_ */
diff --git a/sys/arch/mips64/include/setjmp.h b/sys/arch/mips64/include/setjmp.h
index d611ac3f426..51097989680 100644
--- a/sys/arch/mips64/include/setjmp.h
+++ b/sys/arch/mips64/include/setjmp.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: setjmp.h,v 1.2 2004/08/10 21:10:56 pefo Exp $ */
+/* $OpenBSD: setjmp.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
/* Public domain */
-#ifndef _MIPS_SETJMP_H_
-#define _MIPS_SETJMP_H_
+#ifndef _MIPS64_SETJMP_H_
+#define _MIPS64_SETJMP_H_
#define _JBLEN 83 /* size, in longs, of a jmp_buf */
-#endif /* !_MIPS_SETJMP_H_ */
+#endif /* !_MIPS64_SETJMP_H_ */
diff --git a/sys/arch/mips64/include/signal.h b/sys/arch/mips64/include/signal.h
index 4425e862a49..8061057125a 100644
--- a/sys/arch/mips64/include/signal.h
+++ b/sys/arch/mips64/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.8 2006/01/09 18:18:37 millert Exp $ */
+/* $OpenBSD: signal.h,v 1.9 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
* @(#)signal.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_SIGNAL_H_
-#define _MIPS_SIGNAL_H_
+#ifndef _MIPS64_SIGNAL_H_
+#define _MIPS64_SIGNAL_H_
#include <sys/cdefs.h>
@@ -81,4 +81,4 @@ struct sigcontext {
#define SC_FPC_EIR (71 * REGSZ)
#endif /* __LANGUAGE_ASSEMBLY */
-#endif /* !_MIPS_SIGNAL_H_ */
+#endif /* !_MIPS64_SIGNAL_H_ */
diff --git a/sys/arch/mips64/include/spinlock.h b/sys/arch/mips64/include/spinlock.h
index 283a41903e3..87e9be5a768 100644
--- a/sys/arch/mips64/include/spinlock.h
+++ b/sys/arch/mips64/include/spinlock.h
@@ -1,11 +1,11 @@
-/* $OpenBSD: spinlock.h,v 1.2 2004/08/10 21:10:56 pefo Exp $ */
+/* $OpenBSD: spinlock.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
/* Public domain */
-#ifndef _MIPS_SPINLOCK_H_
-#define _MIPS_SPINLOCK_H_
+#ifndef _MIPS64_SPINLOCK_H_
+#define _MIPS64_SPINLOCK_H_
#define _SPINLOCK_UNLOCKED (0)
#define _SPINLOCK_LOCKED (1)
typedef int _spinlock_lock_t;
-#endif /* !_MIPS_SPINLOCK_H_ */
+#endif /* !_MIPS64_SPINLOCK_H_ */
diff --git a/sys/arch/mips64/include/stdarg.h b/sys/arch/mips64/include/stdarg.h
index 5e8769beca7..d569959c0c4 100644
--- a/sys/arch/mips64/include/stdarg.h
+++ b/sys/arch/mips64/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.7 2008/10/23 21:25:07 kettenis Exp $ */
+/* $OpenBSD: stdarg.h,v 1.8 2011/03/23 16:54:36 pirofti Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -31,8 +31,8 @@
* @(#)stdarg.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_STDARG_H_
-#define _MIPS_STDARG_H_
+#ifndef _MIPS64_STDARG_H_
+#define _MIPS64_STDARG_H_
#include <sys/cdefs.h>
#include <machine/_types.h>
@@ -61,8 +61,8 @@ typedef char * __gnuc_va_list;
/* If this is for internal libc use, don't define anything but __gnuc_va_list */
-#ifndef _VA_MIPS_H_ENUM
-#define _VA_MIPS_H_ENUM
+#ifndef _MIPS64_STDARG_H_
+#define _MIPS64_STDARG_H_
enum {
__no_type_class = -1,
__void_type_class,
@@ -244,4 +244,4 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */
/* Copy __gnuc_va_list into another variable of this type. */
#define __va_copy(dest, src) (dest) = (src)
-#endif /* !_MIPS_STDARG_H_ */
+#endif /* !_MIPS64_STDARG_H_ */
diff --git a/sys/arch/mips64/include/trap.h b/sys/arch/mips64/include/trap.h
index c1533aace1f..445e9ca0a2a 100644
--- a/sys/arch/mips64/include/trap.h
+++ b/sys/arch/mips64/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.12 2010/01/18 16:57:44 miod Exp $ */
+/* $OpenBSD: trap.h,v 1.13 2011/03/23 16:54:36 pirofti Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -37,8 +37,8 @@
* from: @(#)trap.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _MIPS_TRAP_H_
-#define _MIPS_TRAP_H_
+#ifndef _MIPS64_TRAP_H_
+#define _MIPS64_TRAP_H_
/*
* Trap codes (ExcCode in the cause register); also known in trap.c for
@@ -125,4 +125,4 @@ void trapDump(char *msg);
#endif
#endif /* _LOCORE */
-#endif /* !_MIPS_TRAP_H_ */
+#endif /* !_MIPS64_TRAP_H_ */
diff --git a/sys/arch/mips64/include/varargs.h b/sys/arch/mips64/include/varargs.h
index 702f981021d..f008bcc3bf2 100644
--- a/sys/arch/mips64/include/varargs.h
+++ b/sys/arch/mips64/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.2 2005/08/07 07:29:44 miod Exp $ */
+/* $OpenBSD: varargs.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -36,8 +36,8 @@
* @(#)varargs.h 8.2 (Berkeley) 3/22/94
*/
-#ifndef _MIPS_VARARGS_H_
-#define _MIPS_VARARGS_H_
+#ifndef _MIPS64_VARARGS_H_
+#define _MIPS64_VARARGS_H_
#include <machine/stdarg.h>
@@ -47,4 +47,4 @@
#define va_start(ap) \
ap = (char *)&va_alist
-#endif /* !_MIPS_VARARGS_H_ */
+#endif /* !_MIPS64_VARARGS_H_ */
diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h
index 3258da6ce0a..f62e462e1ba 100644
--- a/sys/arch/mips64/include/vmparam.h
+++ b/sys/arch/mips64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.22 2010/12/15 05:30:19 tedu Exp $ */
+/* $OpenBSD: vmparam.h,v 1.23 2011/03/23 16:54:36 pirofti Exp $ */
/* $NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $ */
/*
@@ -38,8 +38,8 @@
* @(#)vmparam.h 8.2 (Berkeley) 4/22/94
*/
-#ifndef _MIPS_VMPARAM_H_
-#define _MIPS_VMPARAM_H_
+#ifndef _MIPS64_VMPARAM_H_
+#define _MIPS64_VMPARAM_H_
/*
* Machine dependent constants mips processors.
@@ -140,4 +140,4 @@ struct vm_page_md {
#endif /* _KERNEL && !_LOCORE */
-#endif /* !_MIPS_VMPARAM_H_ */
+#endif /* !_MIPS64_VMPARAM_H_ */