pmap_kernel() is really kernel_pmap variable

SCCS-vsn: sys/hp300/hp300/machdep.c 7.22
SCCS-vsn: sys/hp300/hp300/mem.c 7.9

diff --git a/usr/src/sys/hp300/hp300/machdep.c b/usr/src/sys/hp300/hp300/machdep.c
index 1946917..a443fd2 100644 (file)
--- a/usr/src/sys/hp300/hp300/machdep.c
+++ b/usr/src/sys/hp300/hp300/machdep.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: machdep.c 1.63 91/04/24$
  *
  *
  * from: Utah $Hdr: machdep.c 1.63 91/04/24$
  *

- *     @(#)machdep.c   7.21 (Berkeley) %G%
+ *     @(#)machdep.c   7.22 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -146,7 +146,7 @@ cpu_startup()
 #endif
        /* avail_end was pre-decremented in pmap_bootstrap to compensate */
        for (i = 0; i < btoc(sizeof (struct msgbuf)); i++)
 #endif
        /* avail_end was pre-decremented in pmap_bootstrap to compensate */
        for (i = 0; i < btoc(sizeof (struct msgbuf)); i++)

-               pmap_enter(pmap_kernel(), (vm_offset_t)msgbufp,
+               pmap_enter(kernel_pmap, (vm_offset_t)msgbufp,

                    avail_end + i * NBPG, VM_PROT_ALL, TRUE);
        msgbufmapped = 1;
 
                    avail_end + i * NBPG, VM_PROT_ALL, TRUE);
        msgbufmapped = 1;
 


@@ -1313,7 +1313,7 @@ findparerror()
        looking = 1;
        ecacheoff();
        for (pg = btoc(lowram); pg < btoc(lowram)+physmem; pg++) {
        looking = 1;
        ecacheoff();
        for (pg = btoc(lowram); pg < btoc(lowram)+physmem; pg++) {

-               pmap_enter(pmap_kernel(), (vm_offset_t)vmmap, ctob(pg),
+               pmap_enter(kernel_pmap, (vm_offset_t)vmmap, ctob(pg),

                    VM_PROT_READ, TRUE);
                for (o = 0; o < NBPG; o += sizeof(int))
                        i = *(int *)(&vmmap[o]);
                    VM_PROT_READ, TRUE);
                for (o = 0; o < NBPG; o += sizeof(int))
                        i = *(int *)(&vmmap[o]);


@@ -1325,7 +1325,7 @@ findparerror()
        found = 0;
 done:
        looking = 0;
        found = 0;
 done:
        looking = 0;

-       pmap_remove(pmap_kernel(), (vm_offset_t)vmmap,
+       pmap_remove(kernel_pmap, (vm_offset_t)vmmap,

            (vm_offset_t)&vmmap[NBPG]);
        ecacheon();
        splx(s);
            (vm_offset_t)&vmmap[NBPG]);
        ecacheon();
        splx(s);

diff --git a/usr/src/sys/hp300/hp300/mem.c b/usr/src/sys/hp300/hp300/mem.c
index 1f29b53..54f8570 100644 (file)
--- a/usr/src/sys/hp300/hp300/mem.c
+++ b/usr/src/sys/hp300/hp300/mem.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: mem.c 1.14 90/10/12$
  *
  *
  * from: Utah $Hdr: mem.c 1.14 90/10/12$
  *

- *     @(#)mem.c       7.8 (Berkeley) %G%
+ *     @(#)mem.c       7.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -63,7 +63,7 @@ mmrw(dev, uio, flags)
                        if (v >= 0xFFFFFFFC || v < lowram)
                                return (EFAULT);
 #endif
                        if (v >= 0xFFFFFFFC || v < lowram)
                                return (EFAULT);
 #endif

-                       pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
+                       pmap_enter(kernel_pmap, (vm_offset_t)vmmap,

                            trunc_page(v), uio->uio_rw == UIO_READ ?
                            VM_PROT_READ : VM_PROT_WRITE, TRUE);
                        o = (int)uio->uio_offset & PGOFSET;
                            trunc_page(v), uio->uio_rw == UIO_READ ?
                            VM_PROT_READ : VM_PROT_WRITE, TRUE);
                        o = (int)uio->uio_offset & PGOFSET;


@@ -71,7 +71,7 @@ mmrw(dev, uio, flags)
                        c = MIN(c, (u_int)(NBPG - o));
                        c = MIN(c, (u_int)iov->iov_len);
                        error = uiomove((caddr_t)&vmmap[o], (int)c, uio);
                        c = MIN(c, (u_int)(NBPG - o));
                        c = MIN(c, (u_int)iov->iov_len);
                        error = uiomove((caddr_t)&vmmap[o], (int)c, uio);

-                       pmap_remove(pmap_kernel(), (vm_offset_t)vmmap,
+                       pmap_remove(kernel_pmap, (vm_offset_t)vmmap,

                            (vm_offset_t)&vmmap[NBPG]);
                        continue;
 
                            (vm_offset_t)&vmmap[NBPG]);
                        continue;