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

2009-03-08 Robert Millan <rmh@aybabtu.com>

Browse source 
Make loader/i386/linux.c usable on i386-pc again.

        * kern/i386/pc/init.c (grub_machine_init): Disable addition of low
        memory to heap.
        * loader/i386/linux.c [GRUB_MACHINE_PCBIOS] (allocate_pages): Remove
        `#error' stanza.
This commit is contained in:
robertmh 2009-03-08 12:46:27 +00:00
parent d8b3b60eea
commit aa9f3bffbd
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2009-03-08 Robert Millan <rmh@aybabtu.com>
Make loader/i386/linux.c usable on i386-pc again.
* kern/i386/pc/init.c (grub_machine_init): Disable addition of low
memory to heap.
* loader/i386/linux.c [GRUB_MACHINE_PCBIOS] (allocate_pages): Remove
`#error' stanza.
2009-03-07 Bean <bean123ch@gmail.com>
* loader/i386/efi/linux.c (grub_rescue_cmd_initrd): Fix a bug in initrd

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

@ -148,10 +148,15 @@ grub_machine_init (void)
grub_gate_a20 (1);
#endif
/* FIXME: This prevents loader/i386/linux.c from using low memory. When our
heap implements support for requesting a chunk in low memory, this should
no longer be a problem. */
#if 0
/* Add the lower memory into free memory. */
if (grub_lower_mem >= GRUB_MEMORY_MACHINE_RESERVED_END)
add_mem_region (GRUB_MEMORY_MACHINE_RESERVED_END,
grub_lower_mem - GRUB_MEMORY_MACHINE_RESERVED_END);
#endif
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)

5
loader/i386/linux.c
View file

@ -143,9 +143,8 @@ allocate_pages (grub_size_t prot_size)
real_mode_mem = 0;
prot_mode_mem = 0;
#ifdef GRUB_MACHINE_PCBIOS
#error i386-pc port adds lower memory to heap, which collides with `real_mode_mem' allocation below
#endif
/* FIXME: Should request low memory from the heap when this feature is
implemented. */
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)