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

Allow loading old kernels by placing GDT in conventional memory.

Browse source
This commit is contained in:
Piotr Krysiuk 2014-04-20 15:58:45 +02:00 committed by Vladimir Serbinenko
parent 3a310e842f
commit 5a6db38d62
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-04-20 Piotr Krysiuk <piotras@gmail.com>
* grub-core/lib/i386/relocator.c: Allow loading old kernels by placing
GDT in conventional memory.
2014-04-10 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/30_os-prober.in: Tolerate devices with no filesystem

11
grub-core/lib/i386/relocator.c
View file

@ -81,10 +81,13 @@ grub_relocator32_boot (struct grub_relocator *rel,
void *relst;
grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_align (rel, &ch, 0,
(0xffffffff - RELOCATOR_SIZEOF (32))
+ 1, RELOCATOR_SIZEOF (32), 16,
GRUB_RELOCATOR_PREFERENCE_NONE,
/* Specific memory range due to Global Descriptor Table for use by payload
that we will store in returned chunk. The address range and preference
are based on "THE LINUX/x86 BOOT PROTOCOL" specification. */
err = grub_relocator_alloc_chunk_align (rel, &ch, 0x1000,
0x9a000 - RELOCATOR_SIZEOF (32),
RELOCATOR_SIZEOF (32), 16,
GRUB_RELOCATOR_PREFERENCE_LOW,
avoid_efi_bootservices);
if (err)
return err;