From ea04b46439a6200a93c2e7792bb488de8ad3c05a Mon Sep 17 00:00:00 2001
From: avg <avg@FreeBSD.org>
Date: Sun, 28 Jul 2013 18:32:27 +0000
Subject: put contents of cpu.h under _KERNEL

no userland-serviceable parts inside

MFC after:	20 days
---
 sys/mips/include/cpu.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sys/mips/include')

diff --git a/sys/mips/include/cpu.h b/sys/mips/include/cpu.h
index 2691cf2..ff5117a 100644
--- a/sys/mips/include/cpu.h
+++ b/sys/mips/include/cpu.h
@@ -49,6 +49,8 @@
 
 #include <machine/endian.h>
 
+#if defined(_KERNEL)
+
 /* BEGIN: these are going away */
 
 #define	soft_int_mask(softintr)	(1 << ((softintr) + 8))
@@ -74,9 +76,7 @@
  * A machine-independent interface to the CPU's counter.
  */
 #define get_cyclecount()	mips_rd_count()
-#endif				/* !_LOCORE */
 
-#if defined(_KERNEL) && !defined(_LOCORE)
 
 extern char btext[];
 extern char etext[];
@@ -85,5 +85,6 @@ void swi_vm(void *);
 void cpu_halt(void);
 void cpu_reset(void);
 
+#endif				/* !_LOCORE */
 #endif				/* _KERNEL */
 #endif				/* !_MACHINE_CPU_H_ */
-- 
cgit v1.1