* util/grub-mkimage.c (generate_image): Decrease the higher limit

because of stack.
	* util/grub-setup.c (setup): Don't add redundancy past the higher load
	limit.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-15 19:39:41 +01:00
parent c476e6df16
commit 5ef5c51147
3 changed files with 14 additions and 3 deletions

View file

@ -958,10 +958,10 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
char *boot_path, *boot_img;
size_t boot_size;
if (GRUB_KERNEL_I386_PC_LINK_ADDR + core_size > GRUB_MEMORY_I386_PC_UPPER)
grub_util_error (_("core image is too big (%p > %p)"),
if (GRUB_KERNEL_I386_PC_LINK_ADDR + core_size > 0x78000)
grub_util_error (_("core image is too big (0x%x > 0x%x)"),
GRUB_KERNEL_I386_PC_LINK_ADDR + core_size,
GRUB_MEMORY_I386_PC_UPPER);
0x78000);
num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
if (num > 0xffff)