* grub-core/kern/ia64/dl_helper.c (grub_ia64_dl_get_tramp_got_size):

	Do not explicitly check for symbol table as it's already checked in
	platform-independent layer.

diff --git a/ChangeLog b/ChangeLog
index 54842365251056b94c027791db033200d4a92ee6..9ce084d582485bc197ee020691585af1ea8a10c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/ia64/dl_helper.c (grub_ia64_dl_get_tramp_got_size):
+       Do not explicitly check for symbol table as it's already checked in
+       platform-independent layer.
+
 2013-12-09  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-mkconfig.in: Add missing newline to output.

diff --git a/grub-core/kern/ia64/dl_helper.c b/grub-core/kern/ia64/dl_helper.c
index 0bebe60e09921152f1310dfd1cad16ec7ea33353..c7e53a67943fe7bc0378708e4d40bea108dda8ef 100644 (file)
--- a/grub-core/kern/ia64/dl_helper.c
+++ b/grub-core/kern/ia64/dl_helper.c
@@ -173,20 +173,10 @@ grub_ia64_dl_get_tramp_got_size (const void *ehdr, grub_size_t *tramp,
                                 grub_size_t *got)
 {
   const Elf64_Ehdr *e = ehdr;
-  grub_size_t cntt = 0, cntg = 0;;
+  grub_size_t cntt = 0, cntg = 0;
   const Elf64_Shdr *s;
   unsigned i;
 
-  /* Find a symbol table.  */
-  for (i = 0, s = (Elf64_Shdr *) ((char *) e + grub_le_to_cpu64 (e->e_shoff));
-       i < grub_le_to_cpu16 (e->e_shnum);
-       i++, s = (Elf64_Shdr *) ((char *) s + grub_le_to_cpu16 (e->e_shentsize)))
-    if (s->sh_type == grub_cpu_to_le32_compile_time (SHT_SYMTAB))
-      break;
-
-  if (i == grub_le_to_cpu16 (e->e_shnum))
-    return GRUB_ERR_NONE;
-
   for (i = 0, s = (Elf64_Shdr *) ((char *) e + grub_le_to_cpu64 (e->e_shoff));
        i < grub_le_to_cpu16 (e->e_shnum);
        i++, s = (Elf64_Shdr *) ((char *) s + grub_le_to_cpu16 (e->e_shentsize)))