Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/powerpc/oea/pmap.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/powerpc/oea/pmap.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.61
retrieving revision 1.61.12.1
diff -u -p -r1.61 -r1.61.12.1
--- src/sys/arch/powerpc/oea/pmap.c	2008/10/29 07:31:18	1.61
+++ src/sys/arch/powerpc/oea/pmap.c	2011/01/07 02:12:19	1.61.12.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.61 2008/10/29 07:31:18 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.61.12.1 2011/01/07 02:12:19 matt Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.61 2008/10/29 07:31:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.61.12.1 2011/01/07 02:12:19 matt Exp $");
 
 #define	PMAP_NOOPNAMES
 
@@ -87,6 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.6
 #include <machine/pcb.h>
 #include <machine/powerpc.h>
 #include <powerpc/spr.h>
+#include <powerpc/oea/spr.h>
 #include <powerpc/oea/sr_601.h>
 #include <powerpc/bat.h>
 #include <powerpc/stdarg.h>
@@ -1951,7 +1952,7 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_
 	 * asssume it's in memory coherent memory.
 	 */
 	pte_lo = PTE_IG;
-	if ((flags & PMAP_NC) == 0) {
+	if ((flags & PMAP_NOCACHE) == 0) {
 		for (mp = mem; mp->size; mp++) {
 			if (pa >= mp->start && pa < mp->start + mp->size) {
 				pte_lo = PTE_M;
@@ -2042,7 +2043,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
 	 * asssume it's in memory coherent memory.
 	 */
 	pte_lo = PTE_IG;
-	if ((prot & PMAP_NC) == 0) {
+	if ((prot & PMAP_NOCACHE) == 0) {
 		for (mp = mem; mp->size; mp++) {
 			if (pa >= mp->start && pa < mp->start + mp->size) {
 				pte_lo = PTE_M;