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

        * kern/i386/multiboot_mmap.c (grub_machine_mmap_init): Improve
        error message for excessively large memory map.

diff --git a/ChangeLog b/ChangeLog
index 525a6d5e02d346f1a9b1d67b5b82989f98b92dc4..ac3950f2ec9247390bdfa22eea7ee2414bf3ea30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-08  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * kern/i386/multiboot_mmap.c (grub_machine_mmap_init): Improve
+       error message for excessively large memory map.
+
 2009-11-08  Robert Millan  <rmh.grub@aybabtu.com>
 
        * 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 6578a4834529009a62ede799d07d1e3ee4da8067..67d824313e64625e2da0eaca82d949b9e92e9b7a 100644 (file)
--- 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);