Remove leftover GRUB_IA64_DL_TRAMP_SIZE.

diff --git a/ChangeLog b/ChangeLog
index ad8356344bb05a60a2f50428ca242f9b0033765f..8aef55ea659076bf125a2dce63afb4a76e10b01d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Remove leftover GRUB_IA64_DL_TRAMP_SIZE.
+
 2013-11-29  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub-dev.texi (Font Metrics): Exclude @image command from DVI

diff --git a/grub-core/kern/ia64/dl.c b/grub-core/kern/ia64/dl.c
index 957ceaae6b3d9796e689892efaf05051d059ed0b..91a2645ce846cbea7b6a2c69ed59cba630112f2f 100644 (file)
--- a/grub-core/kern/ia64/dl.c
+++ b/grub-core/kern/ia64/dl.c
@@ -115,7 +115,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
                      grub_uint64_t noff;
                      grub_ia64_make_trampoline (tr, value);
                      noff = ((char *) tr - (char *) (addr & ~3)) >> 4;
-                     tr = (struct grub_ia64_trampoline *) ((char *) tr + GRUB_IA64_DL_TRAMP_SIZE);
+                     tr++;
+
                      if (noff & ~MASK19)
                        return grub_error (GRUB_ERR_BAD_OS,
                                           "trampoline offset too big (%lx)", noff);

diff --git a/grub-core/kern/ia64/dl_helper.c b/grub-core/kern/ia64/dl_helper.c
index 515e323ad7e7ddea652c0b20f601ff5c882220cd..0bebe60e09921152f1310dfd1cad16ec7ea33353 100644 (file)
--- a/grub-core/kern/ia64/dl_helper.c
+++ b/grub-core/kern/ia64/dl_helper.c
@@ -152,8 +152,6 @@ static const grub_uint8_t jump[0x20] =
 void
 grub_ia64_make_trampoline (struct grub_ia64_trampoline *tr, grub_uint64_t addr)
 {
-  COMPILE_TIME_ASSERT (sizeof (struct grub_ia64_trampoline)
-                      == GRUB_IA64_DL_TRAMP_SIZE);
   grub_memcpy (tr->nop, nopm, sizeof (tr->nop));
   tr->addr_hi[0] = ((addr & 0xc00000) >> 16);
   tr->addr_hi[1] = (addr >> 24) & 0xff;

diff --git a/include/grub/dl.h b/include/grub/dl.h
index 11fc7756888e19e7bb916af977f3c6977569527a..d1d20d9d2887d7d5a7aa7f7d0f9388c53eca5533 100644 (file)
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -240,7 +240,6 @@ void grub_arch_dl_init_linker (void);
 #endif
 
 #define GRUB_IA64_DL_TRAMP_ALIGN 16
-#define GRUB_IA64_DL_TRAMP_SIZE 48
 #define GRUB_IA64_DL_GOT_ALIGN 16
 
 grub_err_t