Module Name: src
Committed By: macallan
Date: Thu Feb 10 05:55:26 UTC 2011
Modified Files:
src/sys/arch/sgimips/sgimips: bus.c
Log Message:
PMAP_NOCACHE -> PGC_NOCACHE where appropriate
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sgimips/sgimips/bus.c
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/sgimips/sgimips/bus.c
diff -u src/sys/arch/sgimips/sgimips/bus.c:1.60 src/sys/arch/sgimips/sgimips/bus.c:1.61
--- src/sys/arch/sgimips/sgimips/bus.c:1.60 Tue Jul 6 20:50:35 2010
+++ src/sys/arch/sgimips/sgimips/bus.c Thu Feb 10 05:55:26 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.60 2010/07/06 20:50:35 cegger Exp $ */
+/* $NetBSD: bus.c,v 1.61 2011/02/10 05:55:26 macallan Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.60 2010/07/06 20:50:35 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.61 2011/02/10 05:55:26 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1194,7 +1194,7 @@
return (-1);
#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
- return (mips_btop(rv | PMAP_NOCACHE));
+ return (mips_btop(rv | PGC_NOCACHE));
#else
return (mips_btop(rv));
#endif
@@ -1211,7 +1211,7 @@
} else
#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
return mips_btop((MIPS_KSEG1_TO_PHYS(addr) + off)
- | PMAP_NOCACHE);
+ | PGC_NOCACHE);
#else
return mips_btop((MIPS_KSEG1_TO_PHYS(addr) + off));
#endif