Module Name: src
Committed By: skrll
Date: Mon Jun 21 14:43:34 UTC 2010
Modified Files:
src/sys/arch/hppa/hppa: pmap.c
src/sys/arch/hppa/include: pmap.h
Log Message:
Allow PVF_UNCACHEABLE in set/clear of pmap_changebit call (for now).
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hppa/include/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/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.75 src/sys/arch/hppa/hppa/pmap.c:1.76
--- src/sys/arch/hppa/hppa/pmap.c:1.75 Fri Apr 2 15:25:51 2010
+++ src/sys/arch/hppa/hppa/pmap.c Mon Jun 21 14:43:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.75 2010/04/02 15:25:51 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.76 2010/06/21 14:43:34 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.75 2010/04/02 15:25:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.76 2010/06/21 14:43:34 skrll Exp $");
#include "opt_cputype.h"
@@ -1476,8 +1476,8 @@
DPRINTF(PDB_FOLLOW|PDB_BITS,
("%s(%p, %x, %x)\n", __func__, pg, set, clear));
- KASSERT((set & ~(PVF_REF)) == 0);
- KASSERT((clear & ~(PVF_MOD|PVF_WRITE)) == 0);
+ KASSERT((set & ~(PVF_REF|PVF_UNCACHEABLE)) == 0);
+ KASSERT((clear & ~(PVF_MOD|PVF_WRITE|PVF_UNCACHEABLE)) == 0);
mutex_enter(&pg->mdpage.pvh_lock);
Index: src/sys/arch/hppa/include/pmap.h
diff -u src/sys/arch/hppa/include/pmap.h:1.26 src/sys/arch/hppa/include/pmap.h:1.27
--- src/sys/arch/hppa/include/pmap.h:1.26 Fri Mar 19 07:29:44 2010
+++ src/sys/arch/hppa/include/pmap.h Mon Jun 21 14:43:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.26 2010/03/19 07:29:44 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.27 2010/06/21 14:43:34 skrll Exp $ */
/* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */
@@ -63,6 +63,7 @@
#define PVF_MOD PTE_PROT(TLB_DIRTY) /* pg/mp is modified */
#define PVF_REF PTE_PROT(TLB_REFTRAP) /* pg/mp (inv) is referenced */
#define PVF_WRITE PTE_PROT(TLB_WRITE) /* pg/mp is writable */
+#define PVF_UNCACHEABLE PTE_PROT(TLB_UNCACHEABLE) /* pg/mp is uncacheable */
#define HPPA_MAX_PID 0xfffa
#define HPPA_SID_MAX 0x7ffd
