From b97b7b914b09a757533119d818332a089b671c8d Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Sun, 8 Nov 2009 20:02:16 +0000 Subject: [PATCH] 2009-11-08 Robert Millan * kern/i386/multiboot_mmap.c (grub_machine_mmap_init): Improve error message for excessively large memory map. --- ChangeLog | 5 +++++ kern/i386/multiboot_mmap.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 525a6d5e0..ac3950f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-11-08 Robert Millan + + * kern/i386/multiboot_mmap.c (grub_machine_mmap_init): Improve + error message for excessively large memory map. + 2009-11-08 Robert Millan * autogen.sh: Use `sh gendistlist.sh' to avoid reliing on diff --git a/kern/i386/multiboot_mmap.c b/kern/i386/multiboot_mmap.c index 6578a4834..67d824313 100644 --- a/kern/i386/multiboot_mmap.c +++ b/kern/i386/multiboot_mmap.c @@ -51,7 +51,8 @@ grub_machine_mmap_init () /* Move the memory map to a safe place. */ if (kern_multiboot_info.mmap_length > sizeof (mmap_entries)) { - grub_printf ("WARNING: Memory map size exceeds limit; it will be truncated\n"); + grub_printf ("WARNING: Memory map size exceeds limit (0x%x > 0x%x); it will be truncated\n", + kern_multiboot_info.mmap_length, sizeof (mmap_entries)); kern_multiboot_info.mmap_length = sizeof (mmap_entries); } grub_memmove (mmap_entries, (void *) kern_multiboot_info.mmap_addr, kern_multiboot_info.mmap_length);