lint

SCCS-vsn: sys/nfs/nfs_socket.c 7.36
SCCS-vsn: sys/hp300/hp300/pmap.c 7.11

diff --git a/usr/src/sys/hp300/hp300/pmap.c b/usr/src/sys/hp300/hp300/pmap.c
index 5f50639..59b6ca9 100644 (file)
--- a/usr/src/sys/hp300/hp300/pmap.c
+++ b/usr/src/sys/hp300/hp300/pmap.c
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)pmap.c      7.10 (Berkeley) %G%
+ *     @(#)pmap.c      7.11 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -2188,7 +2188,7 @@ pmap_enter_ptpage(pmap, va)
                kpt->kpt_next = kpt_used_list;
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;
                kpt->kpt_next = kpt_used_list;
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;

-               bzero(kpt->kpt_va, HP_PAGE_SIZE);
+               bzero((caddr_t)kpt->kpt_va, HP_PAGE_SIZE);

                pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
 #ifdef DEBUG
                if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) {
                pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
 #ifdef DEBUG
                if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) {

diff --git a/usr/src/sys/nfs/nfs_socket.c b/usr/src/sys/nfs/nfs_socket.c
index bb0bc3f..fd7ccc4 100644 (file)
--- a/usr/src/sys/nfs/nfs_socket.c
+++ b/usr/src/sys/nfs/nfs_socket.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_socket.c        7.35 (Berkeley) %G%
+ *     @(#)nfs_socket.c        7.36 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -1208,7 +1208,9 @@ nfs_rephead(siz, nd, err, cache, frev, mrq, mbp, bposp)
  * To avoid retransmission attempts on STREAM sockets (in the future) make
  * sure to set the r_retry field to 0 (implies nm_retry == 0).
  */
  * To avoid retransmission attempts on STREAM sockets (in the future) make
  * sure to set the r_retry field to 0 (implies nm_retry == 0).
  */

-nfs_timer()
+void
+nfs_timer(arg)
+       void *arg;

 {
        register struct nfsreq *rep;
        register struct mbuf *m;
 {
        register struct nfsreq *rep;
        register struct mbuf *m;