From 8090fc012adcf56ae30705a90968f434f9a3c32c Mon Sep 17 00:00:00 2001 From: proski Date: Thu, 14 May 2009 03:48:08 +0000 Subject: [PATCH] 2009-05-13 Pavel Roskin * 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. --- ChangeLog | 8 ++++++++ loader/i386/linux.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b90c2502..4f8dc787b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-05-13 Pavel Roskin + + * 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 * commands/i386/pc/drivemap.c: New file - implement drivemap diff --git a/loader/i386/linux.c b/loader/i386/linux.c index d67a5f8e3..8a7288ecd 100644 --- 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;