2009-05-13 Pavel Roskin <proski@gnu.org>

	* 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.
	(grub_linux_setup_video): Cast render_target->data to
	grub_size_t to fix a warning.

diff --git a/ChangeLog b/ChangeLog
index 5b90c2502c460a0378c10bd9a1ef12f4ac7a4f41..4f8dc787b4eb154104d65efeb74b17952bda6013 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-13  Pavel Roskin  <proski@gnu.org>
+
+       * 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.
+       (grub_linux_setup_video): Cast render_target->data to
+       grub_size_t to fix a warning.
+
 2009-05-13  Javier Martín <lordhabbit@gmail.com>
 
        * commands/i386/pc/drivemap.c: New file - implement drivemap

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index d67a5f8e3c004bca64503e8320429f609b319be3..8a7288ecd67f624b5cbc6c66bd51f1d97816d1f9 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -347,7 +347,8 @@ allocate_pages (grub_size_t prot_size)
          if (real_size + mmap_size > size)
            return 0;
 
-         real_mode_mem = (void *) ((addr + size) - (real_size + mmap_size));
+         real_mode_mem =
+           (void *) (grub_size_t) ((addr + size) - (real_size + mmap_size));
          return 1;
        }
 
@@ -416,7 +417,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
   params->lfb_depth = mode_info.bpp;
   params->lfb_line_len = mode_info.pitch;
 
-  params->lfb_base = (void *) render_target->data;
+  params->lfb_base = (grub_size_t) render_target->data;
   params->lfb_size = (params->lfb_line_len * params->lfb_height + 65535) >> 16;
 
   params->red_mask_size = mode_info.red_mask_size;