Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sun3/sun3x Add a zero argument to pmap_kenter_pa() ...



details:   https://anonhg.NetBSD.org/src/rev/2adc74800503
branches:  trunk
changeset: 748920:2adc74800503
user:      he <he%NetBSD.org@localhost>
date:      Tue Nov 10 17:37:15 2009 +0000

description:
Add a zero argument to pmap_kenter_pa() invocations.
According to cegger@ this is the right thing to do for the moment.

diffstat:

 sys/arch/sun3/sun3x/dvma.c    |  10 ++++++----
 sys/arch/sun3/sun3x/machdep.c |   6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (65 lines):

diff -r f699a08d4d45 -r 2adc74800503 sys/arch/sun3/sun3x/dvma.c
--- a/sys/arch/sun3/sun3x/dvma.c        Tue Nov 10 17:02:36 2009 +0000
+++ b/sys/arch/sun3/sun3x/dvma.c        Tue Nov 10 17:37:15 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dvma.c,v 1.38 2008/04/28 20:23:38 martin Exp $ */
+/*     $NetBSD: dvma.c,v 1.39 2009/11/10 17:37:15 he Exp $     */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.38 2008/04/28 20:23:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dvma.c,v 1.39 2009/11/10 17:37:15 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -219,7 +219,8 @@
 #endif /* DEBUG */
 
                iommu_enter((tva & IOMMU_VA_MASK), pa);
-               pmap_kenter_pa(tva, pa | PMAP_NC, VM_PROT_READ | VM_PROT_WRITE);
+               pmap_kenter_pa(tva,
+                   pa | PMAP_NC, VM_PROT_READ | VM_PROT_WRITE, 0);
        }
        pmap_update(pmap_kernel());
 
@@ -350,7 +351,8 @@
                        panic("%s: unmapped VA", __func__);
 #endif
                iommu_enter((dva & IOMMU_VA_MASK), pa);
-               pmap_kenter_pa(dva, pa | PMAP_NC, VM_PROT_READ | VM_PROT_WRITE);
+               pmap_kenter_pa(dva,
+                   pa | PMAP_NC, VM_PROT_READ | VM_PROT_WRITE, 0);
                kva += PAGE_SIZE;
                dva += PAGE_SIZE;
                sgsize -= PAGE_SIZE;
diff -r f699a08d4d45 -r 2adc74800503 sys/arch/sun3/sun3x/machdep.c
--- a/sys/arch/sun3/sun3x/machdep.c     Tue Nov 10 17:02:36 2009 +0000
+++ b/sys/arch/sun3/sun3x/machdep.c     Tue Nov 10 17:37:15 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.119 2009/08/15 23:45:01 matt Exp $       */
+/*     $NetBSD: machdep.c,v 1.120 2009/11/10 17:37:15 he Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2009/08/15 23:45:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.120 2009/11/10 17:37:15 he Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -688,7 +688,7 @@
                                printf_nolog("\r%4d", todo);
 
                        /* Make a temporary mapping for the page. */
-                       pmap_kenter_pa(vmmap, paddr | PMAP_NC, VM_PROT_READ);
+                       pmap_kenter_pa(vmmap, paddr | PMAP_NC, VM_PROT_READ, 0);
                        pmap_update(pmap_kernel());
                        error = (*dsw->d_dump)(dumpdev, blkno, vaddr,
                                               PAGE_SIZE);



Home | Main Index | Thread Index | Old Index