summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386/libi386/bootinfo.c
diff options
context:
space:
mode:
authorrnordier <rnordier@FreeBSD.org>1999-06-21 18:27:02 +0000
committerrnordier <rnordier@FreeBSD.org>1999-06-21 18:27:02 +0000
commit0571a0f6332f5398e0ec937cf52b258f6b873e0d (patch)
tree67283a139961a2f499f2230906556cb1b3b45306 /sys/boot/i386/libi386/bootinfo.c
parent337113f078668df829c9652c52d1c3db5d3fa7e3 (diff)
downloadFreeBSD-src-0571a0f6332f5398e0ec937cf52b258f6b873e0d.zip
FreeBSD-src-0571a0f6332f5398e0ec937cf52b258f6b873e0d.tar.gz
Fill in bi_bios_geom[] in the bootinfo structure passed to the kernel.
This should resolve the problem raised in PR 12315, and incidentally makes it easier to determine what geometry the BIOS is actually using (by way of boot -v and dmesg).
Diffstat (limited to 'sys/boot/i386/libi386/bootinfo.c')
-rw-r--r--sys/boot/i386/libi386/bootinfo.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 045102a..20517c2 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: bootinfo.c,v 1.18 1999/03/18 14:36:22 dcs Exp $
+ * $Id: bootinfo.c,v 1.19 1999/06/04 03:18:28 ghelmer Exp $
*/
#include <stand.h>
@@ -239,7 +239,7 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
struct i386_devdesc *rootdev;
vm_offset_t addr, bootinfo_addr;
char *rootdevname;
- int bootdevnr;
+ int bootdevnr, i;
u_int pad;
char *kernelname;
const char *kernelpath;
@@ -279,7 +279,8 @@ bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip)
bi.bi_kernelname = 0; /* XXX char * -> kernel name */
bi.bi_nfs_diskless = 0; /* struct nfs_diskless * */
bi.bi_n_bios_used = 0; /* XXX would have to hook biosdisk driver for these */
- /* bi.bi_bios_geom[] */
+ for (i = 0; i < N_BIOS_GEOM; i++)
+ bi.bi_bios_geom[i] = bd_getbigeom(i);
bi.bi_size = sizeof(bi);
bi.bi_memsizes_valid = 1;
bi.bi_basemem = getbasemem();
OpenPOWER on IntegriCloud