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

merge mainline into intwrap

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-29 23:21:21 +02:00
commit 069c9c5fda
137 changed files with 8057 additions and 3591 deletions
Download patch file Download diff file Expand all files Collapse all files

19
grub-core/kern/i386/pc/init.c
View file

@ -45,9 +45,6 @@ struct mem_region
static struct mem_region mem_regions[MAX_REGIONS];
static int num_regions;
grub_addr_t grub_os_area_addr;
grub_size_t grub_os_area_size;
static char *
make_install_device (void)
{
@ -220,25 +217,9 @@ grub_machine_init (void)
compact_mem_regions ();
/* Add the memory regions to free memory, except for the region starting
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)
{
grub_size_t quarter = mem_regions[i].size >> 2;
grub_os_area_addr = mem_regions[i].addr;
grub_os_area_size = mem_regions[i].size - quarter;
grub_mm_init_region ((void *) (grub_os_area_addr + grub_os_area_size),
quarter);
}
else
grub_mm_init_region ((void *) mem_regions[i].addr, mem_regions[i].size);
if (! grub_os_area_addr)
grub_fatal ("no upper memory");
grub_tsc_init ();
}

4
grub-core/kern/i386/pc/startup.S
View file

@ -474,8 +474,6 @@ FUNCTION(grub_chainloader_real_boot)
pushl %edx
pushl %eax
call EXT_C(grub_dl_unload_all)
/* Turn off Gate A20 */
xorl %eax, %eax
call EXT_C(grub_gate_a20)
@ -491,8 +489,6 @@ FUNCTION(grub_chainloader_real_boot)
ljmp $0, $GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR
.code32
#include "../loader.S"
/*
* void grub_console_putchar (int c)
*