From owner-p4-projects@FreeBSD.ORG  Wed Jan  2 08:46:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 39F1A16A41B; Wed,  2 Jan 2008 08:46:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF22116A419
	for <perforce@freebsd.org>; Wed,  2 Jan 2008 08:46:37 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D068513C459
	for <perforce@freebsd.org>; Wed,  2 Jan 2008 08:46:37 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m028kbIN019219
	for <perforce@freebsd.org>; Wed, 2 Jan 2008 08:46:37 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m028kbL9019216
	for perforce@freebsd.org; Wed, 2 Jan 2008 08:46:37 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 2 Jan 2008 08:46:37 GMT
Message-Id: <200801020846.m028kbL9019216@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132296 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 02 Jan 2008 08:46:38 -0000

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

Change 132296 by imp@imp_paco-paco on 2008/01/02 08:45:38

	Resolve conflict between PG_CACHED in vm system and bits that
	are defined for the MIPS PTE that gets stuck into the tlb.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#3 edit
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#3 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#3 (text+ko) ====

@@ -107,7 +107,7 @@
 #define	PG_RW		PG_M
 #define	PG_ATTR		0x0000003f
 #define	PG_UNCACHED	0x00000010
-#define	PG_CACHED	0x00000018
+#define	PG_CACHE	0x00000018
 #define	PG_CACHEMODE	0x00000038
 #define	PG_ROPAGE	(PG_V | PG_RO | PG_CACHED) /* Write protected */
 #define	PG_RWPAGE	(PG_V | PG_M | PG_CACHED)  /* Not wr-prot not clean */

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#3 (text+ko) ====

@@ -584,7 +584,7 @@
 	npte = mips_paddr_to_tlbpfn(pa) | PG_RW | PG_V | PG_G | PG_W;
 
 	if (is_cacheable_mem(pa))
-		npte |= PG_CACHED;
+		npte |= PG_CACHE;
 	else
 		npte |= PG_UNCACHED;
 
@@ -769,7 +769,7 @@
 	fp->state = TRUE;
 	kva = fp->kva;
 
-	npte = mips_paddr_to_tlbpfn(pa) | PG_RW | PG_V | PG_G | PG_W | PG_CACHED;
+	npte = mips_paddr_to_tlbpfn(pa) | PG_RW | PG_V | PG_G | PG_W | PG_CACHE;
 	pte = pmap_pte(kernel_pmap, kva);
 	*pte = npte;
 
@@ -1703,7 +1703,7 @@
 	newpte = mips_paddr_to_tlbpfn(pa) | rw | PG_V;
 
 	if (is_cacheable_mem(pa))
-		newpte |= PG_CACHED;
+		newpte |= PG_CACHE;
 	else
 		newpte |= PG_UNCACHED;
 
@@ -1858,7 +1858,7 @@
 	*pte = mips_paddr_to_tlbpfn(pa) | PG_V;
 
 	if (is_cacheable_mem(pa))
-		*pte |= PG_CACHED;
+		*pte |= PG_CACHE;
 	else
 		*pte |= PG_UNCACHED;