eliminate function pmap_kernel

SCCS-vsn: sys/i386/i386/machdep.c 7.9
SCCS-vsn: sys/i386/i386/mem.c 7.5

diff --git a/usr/src/sys/i386/i386/machdep.c b/usr/src/sys/i386/i386/machdep.c
index 0a861f0..fd98917 100644 (file)
--- a/usr/src/sys/i386/i386/machdep.c
+++ b/usr/src/sys/i386/i386/machdep.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

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

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


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

-               pmap_enter(pmap_kernel(), msgbufp, avail_end + i * NBPG,
+               pmap_enter(kernel_pmap, msgbufp, avail_end + i * NBPG,

                           VM_PROT_ALL, TRUE);
        msgbufmapped = 1;
 
                           VM_PROT_ALL, TRUE);
        msgbufmapped = 1;
 

diff --git a/usr/src/sys/i386/i386/mem.c b/usr/src/sys/i386/i386/mem.c
index 3fc267f..b2fcae7 100644 (file)
--- a/usr/src/sys/i386/i386/mem.c
+++ b/usr/src/sys/i386/i386/mem.c
@@ -11,7 +11,7 @@
  * %sccs.include.redist.c%
  *
  * from: Utah $Hdr: mem.c 1.13 89/10/08$
  * %sccs.include.redist.c%
  *
  * from: Utah $Hdr: mem.c 1.13 89/10/08$

- *     @(#)mem.c       7.4 (Berkeley) %G%
+ *     @(#)mem.c       7.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -59,7 +59,7 @@ mmrw(dev, uio, flags)
 /* minor device 0 is physical memory */
                case 0:
                        v = uio->uio_offset;
 /* minor device 0 is physical memory */
                case 0:
                        v = uio->uio_offset;

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

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


@@ -67,7 +67,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(), vmmap, &vmmap[NBPG]);
+                       pmap_remove(kernel_pmap, vmmap, &vmmap[NBPG]);

                        continue;
 
 /* minor device 1 is kernel memory */
                        continue;
 
 /* minor device 1 is kernel memory */