lint

SCCS-vsn: sys/hp300/include/pmap.h 7.7
SCCS-vsn: sys/hp300/hp300/mem.c 7.8
SCCS-vsn: sys/hp/dev/ite.c 7.7

diff --git a/usr/src/sys/hp/dev/ite.c b/usr/src/sys/hp/dev/ite.c
index fbb6d16..09370a6 100644 (file)
--- a/usr/src/sys/hp/dev/ite.c
+++ b/usr/src/sys/hp/dev/ite.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: ite.c 1.1 90/07/09$
  *
  *
  * from: Utah $Hdr: ite.c 1.1 90/07/09$
  *

- *     @(#)ite.c       7.6 (Berkeley) %G%
+ *     @(#)ite.c       7.7 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -864,7 +864,6 @@ itecnputc(dev, c)
 {
        static int paniced = 0;
        struct ite_softc *ip = &ite_softc[UNIT(dev)];
 {
        static int paniced = 0;
        struct ite_softc *ip = &ite_softc[UNIT(dev)];

-       extern char *panicstr;

 
        if (panicstr && !paniced &&
            (ip->flags & (ITE_ACTIVE|ITE_INGRF)) != ITE_ACTIVE) {
 
        if (panicstr && !paniced &&
            (ip->flags & (ITE_ACTIVE|ITE_INGRF)) != ITE_ACTIVE) {

diff --git a/usr/src/sys/hp300/hp300/mem.c b/usr/src/sys/hp300/hp300/mem.c
index 78b200d..1f29b53 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.7 (Berkeley) %G%
+ *     @(#)mem.c       7.8 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


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

-                       pmap_enter(pmap_kernel(), vmmap, trunc_page(v),
-                               uio->uio_rw == UIO_READ ?
-                                  VM_PROT_READ : VM_PROT_WRITE, TRUE);
+                       pmap_enter(pmap_kernel(), (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;
                        c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET));
                        c = MIN(c, (u_int)(NBPG - o));
                        c = MIN(c, (u_int)iov->iov_len);
                        error = uiomove((caddr_t)&vmmap[o], (int)c, uio);
                        o = (int)uio->uio_offset & PGOFSET;
                        c = (u_int)(NBPG - ((int)iov->iov_base & PGOFSET));
                        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(pmap_kernel(), (vm_offset_t)vmmap,
+                           (vm_offset_t)&vmmap[NBPG]);

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

diff --git a/usr/src/sys/hp300/include/pmap.h b/usr/src/sys/hp300/include/pmap.h
index 1a35318..b0e27c2 100644 (file)
--- a/usr/src/sys/hp300/include/pmap.h
+++ b/usr/src/sys/hp300/include/pmap.h
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)pmap.h      7.6 (Berkeley) %G%
+ *     @(#)pmap.h      7.7 (Berkeley) %G%

  */
 
 #ifndef        _PMAP_MACHINE_
  */
 
 #ifndef        _PMAP_MACHINE_


@@ -42,7 +42,8 @@ extern pmap_t         kernel_pmap;
 #define PMAP_ACTIVATE(pmapp, pcbp, iscurproc) \
        if ((pmapp) != NULL && (pmapp)->pm_stchanged) { \
                (pcbp)->pcb_ustp = \
 #define PMAP_ACTIVATE(pmapp, pcbp, iscurproc) \
        if ((pmapp) != NULL && (pmapp)->pm_stchanged) { \
                (pcbp)->pcb_ustp = \

-                   hp300_btop(pmap_extract(kernel_pmap, (pmapp)->pm_stab)); \
+                   hp300_btop(pmap_extract(kernel_pmap, \
+                       ((vm_offset_t)(pmapp)->pm_stab))); \

                if (iscurproc) \
                        loadustp((pcbp)->pcb_ustp); \
                (pmapp)->pm_stchanged = FALSE; \
                if (iscurproc) \
                        loadustp((pcbp)->pcb_ustp); \
                (pmapp)->pm_stchanged = FALSE; \