[src/trunk]: src/sys/arch/mips/include sprinkle #ifndef __ASSEMBLER__ to make...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/438c50224906
branches:  trunk
changeset: 348288:438c50224906
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Oct 13 18:52:30 2016 +0000

description:
sprinkle #ifndef __ASSEMBLER__ to make this file usable from .S - mostly for
macros like MIPS3_PLUS

diffstat:

 sys/arch/mips/include/locore.h |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (63 lines):

diff -r 4de83025052b -r 438c50224906 sys/arch/mips/include/locore.h
--- a/sys/arch/mips/include/locore.h    Thu Oct 13 18:11:19 2016 +0000
+++ b/sys/arch/mips/include/locore.h    Thu Oct 13 18:52:30 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.100 2016/07/11 16:15:35 matt Exp $ */
+/* $NetBSD: locore.h,v 1.101 2016/10/13 18:52:30 macallan Exp $ */
 
 /*
  * This file should not be included by MI code!!!
@@ -32,6 +32,8 @@
 #include "opt_cputype.h"
 #endif
 
+#ifndef __ASSEMBLER__
+
 #include <sys/cpu.h>
 
 #include <mips/mutex.h>
@@ -45,6 +47,7 @@
 #endif
 
 #include <uvm/pmap/tlb.h>
+#endif /* !__ASSEMBLER__ */
 
 #ifdef _KERNEL
 
@@ -90,6 +93,9 @@
 #error MIPS1 does not support non-4KB page sizes.
 #endif
 
+/* XXX some .S files look for MIPS3_PLUS */
+#ifndef __ASSEMBLER__
+
 /* XXX simonb
  * Should the following be in a cpu_info type structure?
  * And how many of these are per-cpu vs. per-system?  (Ie,
@@ -122,6 +128,8 @@
 #endif
 };
 
+#endif /* !__ASSEMBLER__ */
+
 /*
  * Macros to find the CPU architecture we're on at run-time,
  * or if possible, at compile-time.
@@ -309,6 +317,8 @@
 
 #endif /* run-time test */
 
+#ifndef __ASSEMBLER__
+
 struct tlbmask;
 struct trapframe;
 
@@ -966,7 +976,7 @@
 # define MIPS_CIDFL_RMI_L2SZ(cidfl)                                    \
                ((256*1024) << (((cidfl) & MIPS_CIDFL_RMI_L2SZ_MASK)    \
                        >> MIPS_CIDFL_RMI_L2SZ_SHIFT))
-
+#endif /* !__ASSEMBLER__ */
 #endif /* _KERNEL */
 
 #endif /* _MIPS_LOCORE_H */