3 files changed, 11 insertions, 9 deletions
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index 937e281554b..0f7d5ad8971 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.19 1997/07/21 15:33:32 mickey Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.20 1997/08/04 21:53:34 mickey Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -35,6 +35,7 @@
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/disklabel.h>
+#include <machine/tss.h>
 #include <machine/biosvar.h>
 #include <lib/libsa/saerrno.h>
 #include "libsa.h"
@@ -151,7 +152,7 @@ biosopen(struct open_file *f, ...)
 	}
 
 	bd->edd_flags = EDDcheck((dev_t)bd->biosdev);
-	bd->dinfo = biosdinfo((dev_t)bd->biosdev);
+	bootdev_geometry = bd->dinfo = biosdinfo((dev_t)bd->biosdev);
 
 #ifdef BIOS_DEBUG
 	if (debug) {
diff --git a/sys/arch/i386/stand/libsa/exec_i386.c b/sys/arch/i386/stand/libsa/exec_i386.c
index 3478aca1364..5e5f8e3ea0c 100644
--- a/sys/arch/i386/stand/libsa/exec_i386.c
+++ b/sys/arch/i386/stand/libsa/exec_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_i386.c,v 1.9 1997/07/18 00:50:53 mickey Exp $	*/
+/*	$OpenBSD: exec_i386.c,v 1.10 1997/08/04 21:53:35 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -37,9 +37,10 @@
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/reboot.h>
+#include <machine/biosvar.h>
 #include "libsa.h"
 
-dev_t	bootdev;
+int	bootdev, bootdev_geometry;
 
 #define round_to_size(x) (((int)(x) + sizeof(int) - 1) & ~(sizeof(int) - 1))
 
@@ -65,9 +66,9 @@ machdep_start(startaddr, howto, loadaddr, ssym, esym)
 
 	printf("entry point at 0x%x\n", (int)startaddr);
 	/* stack and the gung is ok at this point, so, no need for asm setup */
-	(*(int __attribute__((noreturn))(*)(int,int,int,int,int,int,int))
+	(*(int __attribute__((noreturn))(*)(int,int,int,int,int,int,int,int))
 		startaddr)(howto, bootdev, 0, round_to_size(esym),
-			   extmem, cnvmem, (int)&apminfo);
+			   extmem, cnvmem, (int)&apminfo, (int)&kentry);
 	/* not reached */
 }
 
diff --git a/sys/arch/i386/stand/libsa/libsa.h b/sys/arch/i386/stand/libsa/libsa.h
index 816fee5764c..d070ba276e1 100644
--- a/sys/arch/i386/stand/libsa/libsa.h
+++ b/sys/arch/i386/stand/libsa/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.9 1997/07/21 15:32:13 mickey Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.10 1997/08/04 21:53:35 mickey Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -40,10 +40,10 @@ void devboot __P((dev_t, char *));
 void *alloca __P((size_t));
 void machdep __P((void));
 u_int apm_init __P((void));
-
+ 
 extern int	boothowto;
 		/* XXX filled in assumption that last file opened is kernel */
-extern int	bootdev;
+extern int	bootdev, bootdev_geometry;
 extern u_int	cnvmem, extmem;
 extern struct apm_connect_info apminfo;
 extern const char bdevs[][4];