Module Name: src
Committed By: macallan
Date: Thu Oct 13 18:52:30 UTC 2016
Modified Files:
src/sys/arch/mips/include: locore.h
Log Message:
sprinkle #ifndef __ASSEMBLER__ to make this file usable from .S - mostly for
macros like MIPS3_PLUS
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/mips/include/locore.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.100 src/sys/arch/mips/include/locore.h:1.101
--- src/sys/arch/mips/include/locore.h:1.100 Mon Jul 11 16:15:35 2016
+++ src/sys/arch/mips/include/locore.h Thu Oct 13 18:52:30 2016
@@ -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 @@ typedef uint32_t pt_entry_t;
#endif
#include <uvm/pmap/tlb.h>
+#endif /* !__ASSEMBLER__ */
#ifdef _KERNEL
@@ -90,6 +93,9 @@ typedef uint32_t pt_entry_t;
#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 @@ struct mips_options {
#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 @@ struct mips_options {
#endif /* run-time test */
+#ifndef __ASSEMBLER__
+
struct tlbmask;
struct trapframe;
@@ -966,7 +976,7 @@ struct pridtab {
# 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 */
