From 451df175ed5f4a23ad6cf21e55dfebcd440a527c Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Mon, 4 May 1992 22:50:34 -0800
Subject: [PATCH] lint

SCCS-vsn: sys/kern/kern_exec.c 7.55
SCCS-vsn: sys/kern/vfs_subr.c 7.71
SCCS-vsn: sys/kern/sysv_shm.c 7.16
---
 usr/src/sys/kern/kern_exec.c | 13 +++++++------
 usr/src/sys/kern/sysv_shm.c  |  7 ++++---
 usr/src/sys/kern/vfs_subr.c  |  6 +++---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index a2e0dba56c..4d27e87769 100644
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.proprietary.c%
  *
- *	@(#)kern_exec.c	7.54 (Berkeley) %G%
+ *	@(#)kern_exec.c	7.55 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -655,11 +655,12 @@ getxfile(p, vp, ep, paged, ssize, uid, gid)
 		 */
 		if (ep->a_text > 0) {
 			error = vn_rdwr(UIO_READ, vp, vm->vm_taddr,
-				(int)ep->a_text, toff, UIO_USERSPACE,
-				(IO_UNIT|IO_NODELOCKED), cred, (int *)0, p);
-			(void) vm_map_protect(&vm->vm_map, vm->vm_taddr,
-				vm->vm_taddr + trunc_page(ep->a_text),
-				VM_PROT_READ|VM_PROT_EXECUTE, FALSE);
+			    (int)ep->a_text, toff, UIO_USERSPACE,
+			    (IO_UNIT|IO_NODELOCKED), cred, (int *)0, p);
+			(void) vm_map_protect(&vm->vm_map,
+			    (vm_offset_t)vm->vm_taddr,
+			    (vm_offset_t)vm->vm_taddr + trunc_page(ep->a_text),
+			    VM_PROT_READ|VM_PROT_EXECUTE, FALSE);
 		}
 	} else {
 		/*
diff --git a/usr/src/sys/kern/sysv_shm.c b/usr/src/sys/kern/sysv_shm.c
index df5fb88dc8..8db5331dba 100644
--- a/usr/src/sys/kern/sysv_shm.c
+++ b/usr/src/sys/kern/sysv_shm.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: uipc_shm.c 1.9 89/08/14$
  *
- *	@(#)sysv_shm.c	7.15 (Berkeley) %G%
+ *	@(#)sysv_shm.c	7.16 (Berkeley) %G%
  */
 
 /*
@@ -319,8 +319,9 @@ shmat(p, uap, retval)
 		flags |= MAP_FIXED;
 	else
 		uva = (caddr_t)0x1000000;	/* XXX */
-	error = vm_mmap(&p->p_vmspace->vm_map, &uva, (vm_size_t)size, prot,
-	    flags, ((struct shmhandle *)shp->shm_handle)->shmh_id, 0);
+	error = vm_mmap(&p->p_vmspace->vm_map, (vm_offset_t *)&uva,
+	    (vm_size_t)size, prot, flags,
+	    ((struct shmhandle *)shp->shm_handle)->shmh_id, 0);
 	if (error)
 		return(error);
 	shmd->shmd_uva = (vm_offset_t)uva;
diff --git a/usr/src/sys/kern/vfs_subr.c b/usr/src/sys/kern/vfs_subr.c
index 938d4d17d6..fee8ff71ab 100644
--- a/usr/src/sys/kern/vfs_subr.c
+++ b/usr/src/sys/kern/vfs_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)vfs_subr.c	7.70 (Berkeley) %G%
+ *	@(#)vfs_subr.c	7.71 (Berkeley) %G%
  */
 
 /*
@@ -733,7 +733,7 @@ void vrele(vp)
 /*
  * Page or buffer structure gets a reference.
  */
-vhold(vp)
+void vhold(vp)
 	register struct vnode *vp;
 {
 
@@ -743,7 +743,7 @@ vhold(vp)
 /*
  * Page or buffer structure frees a reference.
  */
-holdrele(vp)
+void holdrele(vp)
 	register struct vnode *vp;
 {
 
-- 
2.20.1