From 450b4c5cf434f35a45a1ff9dd6fc634fd777d712 Mon Sep 17 00:00:00 2001 From: bde Date: Tue, 19 Mar 1996 15:03:00 +0000 Subject: Fixed unsigned longs that should have been vm_offset_t. vm_offset_t is currently unsigned long but should probably be plain unsigned for i386's to match the choice of minimal types to represent for fixed-width types in Lite2. Anyway, it shouldn't be assumed to be unsigned long. I only fixed the type mismatches that were detected when I changed vm_offset_t to unsigned. Only pointer type mismatches were detected. --- sys/i386/linux/imgact_linux.c | 8 +++++--- sys/i386/linux/linux_misc.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'sys/i386/linux') diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 8967a6a2..fa83d52 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_linux.c,v 1.11 1996/03/10 23:25:17 peter Exp $ + * $Id: imgact_linux.c,v 1.12 1996/03/12 06:20:16 peter Exp $ */ #include @@ -61,8 +61,10 @@ exec_linux_imgact(imgp) { struct exec *a_out = (struct exec *) imgp->image_header; struct vmspace *vmspace = imgp->proc->p_vmspace; - unsigned long vmaddr, virtual_offset, file_offset; - unsigned long buffer, bss_size; + vm_offset_t vmaddr; + unsigned long virtual_offset, file_offset; + vm_offset_t buffer; + unsigned long bss_size; int error; if (((a_out->a_magic >> 16) & 0xff) != 0x64) diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index c78b6b9..6f8ec9e 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_misc.c,v 1.15 1996/03/10 23:25:17 peter Exp $ + * $Id: linux_misc.c,v 1.16 1996/03/12 06:20:14 peter Exp $ */ #include @@ -165,8 +165,10 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args, int *retval) struct vnode *vp; struct exec *a_out; struct vattr attr; - unsigned long vmaddr, file_offset; - unsigned long buffer, bss_size; + vm_offset_t vmaddr; + unsigned long file_offset; + vm_offset_t buffer; + unsigned long bss_size; char *ptr; int error; caddr_t sg; -- cgit v1.1