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

Add #error instance with comment to explain why this

Browse source 
loader isn't currently usable on PC/BIOS.
This commit is contained in:
robertmh 2008-11-14 20:18:07 +00:00
parent dfab719fc8
commit 2f2a344257
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -14,7 +14,8 @@
an appropiate place in lower memory, between 0x10000 and 0x90000, an appropiate place in lower memory, between 0x10000 and 0x90000,
like loader/i386/efi/linux.c does. Linux often panics if real_mode_mem like loader/i386/efi/linux.c does. Linux often panics if real_mode_mem
is in our heap (probably as a result of it being corrupted during is in our heap (probably as a result of it being corrupted during
decompression). decompression). Add #error instance with comment to explain why this
loader isn't currently usable on PC/BIOS.
2008-11-14 Robert Millan <rmh@aybabtu.com> 2008-11-14 Robert Millan <rmh@aybabtu.com>

7
loader/i386/linux.c
View file

@ -17,6 +17,7 @@
*/ */
#include <grub/loader.h> #include <grub/loader.h>
#include <grub/machine/machine.h>
#include <grub/machine/memory.h> #include <grub/machine/memory.h>
#include <grub/machine/loader.h> #include <grub/machine/loader.h>
#include <grub/file.h> #include <grub/file.h>
@ -142,6 +143,12 @@ allocate_pages (grub_size_t prot_size)
real_mode_mem = 0; real_mode_mem = 0;
prot_mode_mem = 0; prot_mode_mem = 0;
/* i386-pc port adds lower memory to heap, which collides with
`real_mode_mem' allocation below. */
#ifdef GRUB_MACHINE_PCBIOS
#error
#endif
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t); 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) int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
{ {