[2213] 2009-05-13 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 2213
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2213
Author:   proski
Date:     2009-05-14 03:59:10 +0000 (Thu, 14 May 2009)
Log Message:
-----------
2009-05-13  Pavel Roskin  <address@hidden>

        * loader/i386/multiboot.c (grub_multiboot): Cast mmap_addr to
        grub_uint32_t to avoid a warning.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/i386/multiboot.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-05-14 03:48:08 UTC (rev 2212)
+++ trunk/grub2/ChangeLog       2009-05-14 03:59:10 UTC (rev 2213)
@@ -1,5 +1,8 @@
 2009-05-13  Pavel Roskin  <address@hidden>
 
+       * loader/i386/multiboot.c (grub_multiboot): Cast mmap_addr to
+       grub_uint32_t to avoid a warning.
+
        * loader/i386/linux.c (allocate_pages): When assigning
        real_mode_mem, cast through grub_size_t to fix a warning.  The
        code already makes sure that the value would fit a pointer.

Modified: trunk/grub2/loader/i386/multiboot.c
===================================================================
--- trunk/grub2/loader/i386/multiboot.c 2009-05-14 03:48:08 UTC (rev 2212)
+++ trunk/grub2/loader/i386/multiboot.c 2009-05-14 03:59:10 UTC (rev 2213)
@@ -320,7 +320,7 @@
 
   /* FIXME: grub_uint32_t will break for addresses above 4 GiB, but is mandated
      by the spec.  Is there something we can do about it?  */
-  mbi->mmap_addr = mmap_addr (grub_multiboot_payload_dest);
+  mbi->mmap_addr = (grub_uint32_t) mmap_addr (grub_multiboot_payload_dest);
   mbi->flags |= MULTIBOOT_INFO_MEM_MAP;
 
   if (grub_multiboot_payload_dest >= grub_multiboot_payload_orig)