* grub-core/kern/elfXX.c: Use grub_addr_t rather than long when

	appropriate.

diff --git a/ChangeLog b/ChangeLog
index 506b85dbc81692a92095ee0c20f650c6fcb7700f..8bc99c121932b4a3abcbfa19c24cf9b52bad75c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/elfXX.c: Use grub_addr_t rather than long when
+       appropriate.
+
 2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/loopback.c: Use sequential IDs rather than pointer.

diff --git a/grub-core/kern/elfXX.c b/grub-core/kern/elfXX.c
index 2e45449198293c09b2bbee43582122535cf9faa0..1d0997186f7f8c10090f75d24ffa39eb4414d7d7 100644 (file)
--- a/grub-core/kern/elfXX.c
+++ b/grub-core/kern/elfXX.c
@@ -141,7 +141,7 @@ grub_elfXX_load (grub_elf_t elf, const char *filename,
       }
 
     if (phdr->p_filesz < phdr->p_memsz)
-      grub_memset ((void *) (long) (load_addr + phdr->p_filesz),
+      grub_memset ((void *) (grub_addr_t) (load_addr + phdr->p_filesz),
                   0, phdr->p_memsz - phdr->p_filesz);
 
     load_size += phdr->p_memsz;