summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2005-01-18 15:03:39 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2005-01-18 15:03:39 +0000
commit1f63b75add422b12b864a8c3f3a0d4cebecb0525 (patch)
tree7e63c7272e7178c56a7b9a7c10dbd772cb6e7cb9 /sys/arch
parent89252fd19ba73c2d4e7925f9b540ed2f2cb6d0be (diff)
Move rm7000.h file from sgi to mips64.
ok pefo@ miod@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/mips64/include/rm7000.h (renamed from sys/arch/sgi/include/rm7000.h)8
-rw-r--r--sys/arch/mips64/mips64/interrupt.c4
-rw-r--r--sys/arch/mips64/mips64/trap.c4
-rw-r--r--sys/arch/sgi/sgi/machdep.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/sgi/include/rm7000.h b/sys/arch/mips64/include/rm7000.h
index 141d1ada575..86db8feb2d9 100644
--- a/sys/arch/sgi/include/rm7000.h
+++ b/sys/arch/mips64/include/rm7000.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rm7000.h,v 1.2 2004/08/10 18:52:58 deraadt Exp $ */
+/* $OpenBSD: rm7000.h,v 1.1 2005/01/18 15:03:38 grange Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -26,8 +26,8 @@
*
*/
-#ifndef _MACHINE_RM7000_H
-#define _MACHINE_RM7000_H
+#ifndef _MIPS64_RM7000_H_
+#define _MIPS64_RM7000_H_
/*
* QED RM7000 specific defines.
@@ -96,4 +96,4 @@ int cp0_getperfcount __P((void));
__END_DECLS
#endif /* _KERNEL */
-#endif /* _MACHINE_RM7000_H */
+#endif /* _MIPS64_RM7000_H_ */
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c
index cf46cf7ea2e..27c43b39ae9 100644
--- a/sys/arch/mips64/mips64/interrupt.c
+++ b/sys/arch/mips64/mips64/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.9 2004/10/08 07:14:57 grange Exp $ */
+/* $OpenBSD: interrupt.c,v 1.10 2005/01/18 15:03:38 grange Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -47,7 +47,7 @@
#include <machine/frame.h>
#include <machine/regnum.h>
-#include <machine/rm7000.h>
+#include <mips64/rm7000.h>
#include <mips64/archtype.h>
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index 6f6b4ec05f2..2510cfc246c 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.20 2004/12/24 22:50:30 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.21 2005/01/18 15:03:38 grange Exp $ */
/* tracked to 1.23 */
/*
@@ -75,7 +75,7 @@
#include <machine/frame.h>
#include <machine/regnum.h>
-#include <machine/rm7000.h>
+#include <mips64/rm7000.h>
#include <mips64/archtype.h>
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index 78dd3df0d3f..b97ac891584 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.21 2004/12/14 09:07:49 grange Exp $ */
+/* $OpenBSD: machdep.c,v 1.22 2005/01/18 15:03:38 grange Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -75,7 +75,7 @@
#include <machine/mnode.h>
#endif
-#include <machine/rm7000.h>
+#include <mips64/rm7000.h>
#include <dev/cons.h>