vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Split a memory chunk spanning accross 1MiB mark for openbsd

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-02 16:26:00 +02:00
parent 32fa4348a3
commit 92517362b2
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
loader/i386/bsd.c
View file

@ -301,7 +301,7 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
{ {
prev.size += cur.size; prev.size += cur.size;
if (mmap) if (mmap)
mmap[-1] = prev; mmap[-1] = prev;
} }
else else
{ {
@ -311,6 +311,23 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
count++; count++;
} }
if (kernel_type == KERNEL_TYPE_OPENBSD && prev.addr < 0x100000
&& prev.addr + prev.size > 0x100000)
{
cur.addr = 0x100000;
cur.size = prev.addr + prev.size - 0x100000;
cur.type = prev.type;
prev.size = 0x100000 - prev.addr;
if (mmap)
{
mmap[-1] = prev;
mmap[0] = cur;
mmap++;
}
prev = cur;
count++;
}
return 0; return 0;
} }
@ -1475,7 +1492,7 @@ grub_cmd_openbsd (grub_extcmd_t cmd, int argc, char *argv[])
if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE) if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
{ {
grub_loader_set (grub_openbsd_boot, grub_bsd_unload, 1); grub_loader_set (grub_openbsd_boot, grub_bsd_unload, 0);
openbsd_root = bootdev; openbsd_root = bootdev;
} }