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

REmove memory map altering for FreeBSD

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-01 16:38:10 +02:00
parent aa8d7b2647
commit 6d971470fa
1 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
loader/i386/bsd.c
View file

@ -258,7 +258,6 @@ static void
generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf) generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
{ {
int count = 0; int count = 0;
int isfirstrun = 1;
struct grub_e820_mmap *mmap = buf; struct grub_e820_mmap *mmap = buf;
struct grub_e820_mmap prev, cur; struct grub_e820_mmap prev, cur;
@ -266,21 +265,6 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
grub_uint32_t type) grub_uint32_t type)
{ {
/* FreeBSD assumes that first 64KiB are available.
Not always true but try to prevent panic somehow. */
if (kernel_type == KERNEL_TYPE_FREEBSD && isfirstrun && addr != 0)
{
cur.addr = 0;
cur.size = (addr < 0x10000) ? addr : 0x10000;
cur.type = GRUB_E820_RAM;
if (mmap)
*mmap++ = cur;
prev = cur;
count++;
}
isfirstrun = 0;
cur.addr = addr; cur.addr = addr;
cur.size = size; cur.size = size;
switch (type) switch (type)
@ -317,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] = cur; mmap[-1] = prev;
} }
else else
{ {
@ -330,7 +314,6 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
return 0; return 0;
} }
isfirstrun = 1;
grub_mmap_iterate (hook); grub_mmap_iterate (hook);
if (len) if (len)