From owner-p4-projects@FreeBSD.ORG  Sun Jan  4 16:32:27 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9FD5316A4EC; Sun,  4 Jan 2004 16:32:26 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 731DE16A4CF
	for <perforce@freebsd.org>; Sun,  4 Jan 2004 16:32:26 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9F5D743D3F
	for <perforce@freebsd.org>; Sun,  4 Jan 2004 16:32:24 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i050WO0B045473
	for <perforce@freebsd.org>; Sun, 4 Jan 2004 16:32:24 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i050WO6u045470
	for perforce@freebsd.org; Sun, 4 Jan 2004 16:32:24 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sun, 4 Jan 2004 16:32:24 -0800 (PST)
Message-Id: <200401050032.i050WO6u045470@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 44789 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 00:32:27 -0000

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

Change 44789 by jmallett@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