From dc1560b257cd2576ab15eb332a7c0a3fb9f45c55 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sat, 10 Oct 1998 14:02:07 +0000
Subject: Fixed warnings for pointer versus int type mismatches.  Addresses
 must be converted to fixed-sized integers when they are passed across the
 binary interface to the kernel.

---
 sys/i386/boot/biosboot/boot.c | 6 +++---
 sys/i386/boot/netboot/main.c  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sys/i386/boot')

diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index c413647..e1ff4f9 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.71 1998/09/23 06:50:45 yokota Exp $
+ *	$Id: boot.c,v 1.72 1998/10/01 18:22:46 msmith Exp $
  */
 
 
@@ -314,8 +314,8 @@ loadprog(void)
 	bootdev = MAKEBOOTDEV(maj, (slice >> 4), slice & 0xf, unit, part);
 
 	bootinfo.bi_version = BOOTINFO_VERSION;
-	bootinfo.bi_kernelname = name + ouraddr;
-	bootinfo.bi_nfs_diskless = NULL;
+	bootinfo.bi_kernelname = (u_int32_t)(name + ouraddr);
+	bootinfo.bi_nfs_diskless = 0;
 	bootinfo.bi_size = sizeof(bootinfo);
 	bootinfo.bi_bios_dev = dosdev;
 
diff --git a/sys/i386/boot/netboot/main.c b/sys/i386/boot/netboot/main.c
index 4ee5b9f..ba8885c 100644
--- a/sys/i386/boot/netboot/main.c
+++ b/sys/i386/boot/netboot/main.c
@@ -308,7 +308,7 @@ cfg_done:
 	while (((int)loadpoint) & PAGE_MASK)
 		*(loadpoint++) = 0;
 
-	bootinfo.bi_symtab = (int) loadpoint;
+	bootinfo.bi_symtab = (u_int32_t)loadpoint;
 
 	p = (char*)&head.a_syms;
 	for (i=0;i<sizeof(head.a_syms);i++)
@@ -324,14 +324,14 @@ cfg_done:
 	printf("+0x%x]\n", i);
 	i -= sizeof(int);
 	nfsload(i);
-	bootinfo.bi_esymtab = (int) loadpoint;
+	bootinfo.bi_esymtab = (u_int32_t)loadpoint;
 
 	printf("entry=0x%X.\n\r",head.a_entry);
 
 		/* Jump to kernel */
 	bootinfo.bi_version = BOOTINFO_VERSION;
-	bootinfo.bi_kernelname = kernel;
-	bootinfo.bi_nfs_diskless = &nfsdiskless;
+	bootinfo.bi_kernelname = (u_int32_t)kernel;
+	bootinfo.bi_nfs_diskless = (u_int32_t)&nfsdiskless;
 	bootinfo.bi_size = sizeof bootinfo;
 	kernelentry = (void *)(head.a_entry & 0x00FFFFFF);
 	(*kernelentry)(howto|RB_BOOTINFO,NODEV,0,0,0,&bootinfo,0,0,0);
-- 
cgit v1.1