Module Name: src
Committed By: matt
Date: Fri Jan 7 01:52:40 UTC 2011
Modified Files:
src/sys/arch/powerpc/include/ibm4xx [matt-nb5-pq3]: pmap.h
src/sys/arch/powerpc/include/oea [matt-nb5-pq3]: pmap.h
Log Message:
PMAP_NC -> PMAP_NOCACHE.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.66.1 src/sys/arch/powerpc/include/ibm4xx/pmap.h
cvs rdiff -u -r1.13 -r1.13.30.1 src/sys/arch/powerpc/include/oea/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/ibm4xx/pmap.h
diff -u src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.13 src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.13.66.1
--- src/sys/arch/powerpc/include/ibm4xx/pmap.h:1.13 Wed Feb 21 22:59:49 2007
+++ src/sys/arch/powerpc/include/ibm4xx/pmap.h Fri Jan 7 01:52:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.13 2007/02/21 22:59:49 thorpej Exp $ */
+/* $NetBSD: pmap.h,v 1.13.66.1 2011/01/07 01:52:40 matt Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -128,9 +128,9 @@
* Extra flags to pass to pmap_enter() -- make sure they don't conflict
* w/PMAP_CANFAIL or PMAP_WIRED
*/
-#define PME_NOCACHE 0x100
-#define PME_WRITETHROUG 0x200
-#define PMAP_NC PME_NOCACHE /* XXX: OEA pmap compat. for bus_dma */
+#define PME_NOCACHE 0x1000000
+#define PME_WRITETHROUG 0x2000000
+#define PMAP_NOCACHE PME_NOCACHE /* XXX: OEA pmap compat. for bus_dma */
#ifndef _LOCORE
Index: src/sys/arch/powerpc/include/oea/pmap.h
diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.13 src/sys/arch/powerpc/include/oea/pmap.h:1.13.30.1
--- src/sys/arch/powerpc/include/oea/pmap.h:1.13 Thu Feb 7 00:36:57 2008
+++ src/sys/arch/powerpc/include/oea/pmap.h Fri Jan 7 01:52:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.13 2008/02/07 00:36:57 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.13.30.1 2011/01/07 01:52:39 matt Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -250,7 +250,7 @@
int pmap_setup_segment0_map(int use_large_pages, ...);
#endif
-#define PMAP_NC 0x1000
+#define PMAP_NOCACHE 0x1000000
#define PMAP_STEAL_MEMORY
#define PMAP_NEED_PROCWR
