[src/trunk]: src/sys/arch/sparc/sparc As pointed out by Jason, the protection...

[pk <pk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa209df51b23
branches:  trunk
changeset: 550026:fa209df51b23
user:      pk <pk%NetBSD.org@localhost>
date:      Mon Jul 28 07:05:56 2003 +0000

description:
As pointed out by Jason, the protection bits in pmap_enter()'s `flags' field
are valid (though the sparc implementation currently ignores them), so restore
revision 1.34.

diffstat:

 sys/arch/sparc/sparc/mem.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 1be0fbcf9281 -r fa209df51b23 sys/arch/sparc/sparc/mem.c
--- a/sys/arch/sparc/sparc/mem.c        Mon Jul 28 07:04:17 2003 +0000
+++ b/sys/arch/sparc/sparc/mem.c        Mon Jul 28 07:05:56 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.35 2003/07/25 07:25:31 pk Exp $ */
+/*     $NetBSD: mem.c,v 1.36 2003/07/28 07:05:56 pk Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.35 2003/07/25 07:25:31 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.36 2003/07/28 07:05:56 pk Exp $");
 
 #include "opt_sparc_arch.h"
 
@@ -126,7 +126,7 @@
                        prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
                            VM_PROT_WRITE;
                        pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
-                           trunc_page(pa), prot, PMAP_WIRED);
+                           trunc_page(pa), prot, prot|PMAP_WIRED);
                        pmap_update(pmap_kernel());
                        o = uio->uio_offset & PGOFSET;
                        c = min(uio->uio_resid, (int)(PAGE_SIZE - o));