From: robertmh <robertmh@localhost>
Date: Thu, 20 Nov 2008 20:22:04 +0000 (+0000)
Subject:         * loader/i386/linux.c (allocate_pages): Fix a warning.
X-Git-Tag: 1.98~1198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e94045a11015f02af1969bda091016e7a3190ea7;p=thirdparty%2Fgrub.git

    * loader/i386/linux.c (allocate_pages): Fix a warning.
---

diff --git a/ChangeLog b/ChangeLog
index 8517aed5a..71a564de0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
 	* util/grub.d/00_header.in: Likewise.
 	* util/update-grub_lib.in: Likewise.
 
+	* loader/i386/linux.c (allocate_pages): Fix a warning.
+
 2008-11-19  Robert Millan  <rmh@aybabtu.com>
 
 	* loader/i386/pc/linux.c (grub_rescue_cmd_initrd): Fix a typo.
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 98027b0ed..8b653cf2f 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -169,7 +169,7 @@ allocate_pages (grub_size_t prot_size)
 	  if (real_size + mmap_size > size)
 	    return 0;
 
-	  real_mode_mem = (addr + size) - (real_size + mmap_size);
+	  real_mode_mem = (void *) ((addr + size) - (real_size + mmap_size));
 	  return 1;
 	}