PERFORCE change 44789 for review

[Juli Mallett]

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

Change 44789 by jmallett at jmallett_oingo on 2004/01/04 16:31:46

	Clarity.

Affected files ...

.. //depot/projects/mips/sys/mips/include/pte.h#18 edit

Differences ...

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

@@ -55,16 +55,17 @@
 #define	MIPS_HI_R_USER		(0x00 << MIPS_HI_R_SHIFT)
 #define	MIPS_HI_R_SUPERVISOR	(0x01 << MIPS_HI_R_SHIFT)
 #define	MIPS_HI_R_KERNEL	(0x03 << MIPS_HI_R_SHIFT)
+#define	MIPS_HI_R_MASK		(0x03 << MIPS_HI_R_SHIFT)
 #else
 #define	MIPS_HI_R_USER		(0x00UL << MIPS_HI_R_SHIFT)
 #define	MIPS_HI_R_SUPERVISOR	(0x01UL << MIPS_HI_R_SHIFT)
 #define	MIPS_HI_R_KERNEL	(0x03UL << MIPS_HI_R_SHIFT)
+#define	MIPS_HI_R_MASK		(0x03UL << MIPS_HI_R_SHIFT)
 #endif
-#define	MIPS_HI_R_MASK		(MIPS_HI_R_USER | MIPS_HI_R_SUPERVISOR | MIPS_HI_R_KERNEL)
 #define	MIPS_HI_VA_R(va)	((va) & MIPS_HI_R_MASK)
 #define	MIPS_HI_FILL_SHIFT	40
-#define	MIPS_HI_FILL_MASK	((0x800000UL - 1) << MIPS_HI_FILL_SHIFT)
-#define	MIPS_HI_VA_FILL(va)	((((va) & (1ULL << 63)) != 0 ? MIPS_HI_FILL_MASK : 0))
+#define	MIPS_HI_FILL_MASK	((0x7FFFFFUL) << MIPS_HI_FILL_SHIFT)
+#define	MIPS_HI_VA_FILL(va)	((((va) & (1UL << 63)) != 0 ? MIPS_HI_FILL_MASK : 0))
 #define	MIPS_HI_VPN2_SHIFT	(PAGE_SHIFT + 1)
 /* XXX VPN2 masking is wrong.  Should trim off below VPN2_SHIFT, and from FILL_SHIFT up. */
 #ifdef LOCORE