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

First working newreloc

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-10 15:06:17 +01:00
parent 6b60576149
commit 14e43c6e02
7 changed files with 127 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kern/i386/pc/init.c
View file

@ -190,7 +190,7 @@ grub_machine_init (void)
from 1MB. This region is partially used for loading OS images.
For now, 1/4 of this is added to free memory. */
for (i = 0; i < num_regions; i++)
if (mem_regions[i].addr == 0x100000)
/* if (mem_regions[i].addr == 0x100000)
{
grub_size_t quarter = mem_regions[i].size >> 2;
@ -199,11 +199,11 @@ grub_machine_init (void)
grub_mm_init_region ((void *) (grub_os_area_addr + grub_os_area_size),
quarter);
}
else
else*/
grub_mm_init_region ((void *) mem_regions[i].addr, mem_regions[i].size);
if (! grub_os_area_addr)
grub_fatal ("no upper memory");
// if (! grub_os_area_addr)
//grub_fatal ("no upper memory");
grub_tsc_init ();
}