summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-08-06 21:54:28 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-08-06 21:54:28 +0000
commit1cc21b2bfac371283ef92b44a84bdd9218afe035 (patch)
treeba9d29792a459a0de24c01c60738c45d2edd55e7 /sys
parentfeb56279b5746ffb588937f722b9644f732a7941 (diff)
Make sure <machine/cpu.h> includes <machine/intr.h> when included with _LOCORE
defined; cp0access.S relies on this.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mips64/include/cpu.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index f78d45326e6..0de6f4cc98a 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.34 2009/08/06 21:11:38 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.35 2009/08/06 21:54:27 miod Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -383,8 +383,13 @@ extern struct cpu_info cpu_info_primary;
#define cpu_number() 0
#include <machine/frame.h>
+
+#endif /* _LOCORE */
+
#include <machine/intr.h>
+#ifndef _LOCORE
+
/*
* Arguments to hardclock encapsulate the previous machine state in
* an opaque clockframe.