PERFORCE change 29923 for review

[Juli Mallett]

http://perforce.freebsd.org/chv.cgi?CH=29923

Change 29923 by jmallett at jmallett_dalek on 2003/04/27 20:32:21

	We -DLOCORE not -D_LOCORE.

Affected files ...

.. //depot/projects/mips/sys/mips/include/cpu.h#6 edit
.. //depot/projects/mips/sys/mips/include/endian.h#3 edit
.. //depot/projects/mips/sys/mips/include/pte.h#2 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/cpu.h#6 (text+ko) ====

@@ -75,7 +75,7 @@
 	return (++now);
 }
 
-#ifndef _LOCORE
+#ifndef LOCORE
 /* XXX simonb
  * Should the following be in a cpu_info type structure?
  * And how many of these are per-cpu vs. per-system?  (Ie,

==== //depot/projects/mips/sys/mips/include/endian.h#3 (text+ko) ====

@@ -39,7 +39,9 @@
 #define	_MACHINE_ENDIAN_H_
 
 #include <sys/cdefs.h>
+#ifndef	LOCORE
 #include <sys/_types.h>
+#endif
 
 #ifdef	_KERNEL
 #include "opt_endian.h"
@@ -86,6 +88,7 @@
 #define	BYTE_ORDER	_BYTE_ORDER
 #endif
 
+#ifndef	LOCORE
 #ifdef __GNUC__
 
 static __inline __uint16_t
@@ -128,5 +131,6 @@
 #define	_BYTEORDER_FUNC_DEFINED
 
 #endif /* __GNUC__ */
+#endif
 
 #endif /* !_MACHINE_ENDIAN_H_ */

==== //depot/projects/mips/sys/mips/include/pte.h#2 (text+ko) ====

@@ -99,7 +99,7 @@
  * R4000 hardware page table entry
  */
 
-#ifndef _LOCORE
+#ifndef LOCORE
 struct mips3_pte {
 #if BYTE_ORDER == BIG_ENDIAN
 unsigned int	pg_prot:2,		/* SW: access control */
@@ -129,7 +129,7 @@
 	int	tlb_lo0;	/* XXX maybe 64 bits (only 32 really used) */
 	int	tlb_lo1;	/* XXX maybe 64 bits (only 32 really used) */
 };
-#endif /* _LOCORE */
+#endif /* LOCORE */
 
 #define MIPS3_PG_WIRED	0x80000000	/* SW */
 #define MIPS3_PG_RO	0x40000000	/* SW */
@@ -199,7 +199,7 @@
 
 #define	PG_ASID	0x000000ff	/* Address space ID */
 
-#ifndef _LOCORE
+#ifndef LOCORE
 #include <machine/cpu.h>
 
 typedef union pt_entry {
@@ -227,9 +227,9 @@
 #define	mips_tlbpfn_to_paddr(x)		mips3_tlbpfn_to_paddr((vaddr_t)(x))
 #define	mips_paddr_to_tlbpfn(x)		mips3_paddr_to_tlbpfn((x))
 
-#endif /* ! _LOCORE */
+#endif /* ! LOCORE */
 
-#if defined(_KERNEL) && !defined(_LOCORE)
+#if defined(_KERNEL) && !defined(LOCORE)
 /*
  * Kernel virtual address to page table entry and visa versa.
  */
@@ -240,5 +240,5 @@
 
 extern	pt_entry_t *kptemap;		/* kernel pte table */
 extern	vm_size_t kptemapsize;		/* number of pte's in Sysmap */
-#endif	/* defined(_KERNEL) && !defined(_LOCORE) */
+#endif	/* defined(_KERNEL) && !defined(LOCORE) */
 #endif /* __MIPS_PTE_H__ */