vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove leftover GRUB_IA64_DL_TRAMP_SIZE.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-11-30 11:14:30 +01:00
parent 8ddf84bfb8
commit ce55ed0389
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2013-11-29 Colin Watson <cjwatson@ubuntu.com>
* docs/grub-dev.texi (Font Metrics): Exclude @image command from DVI * docs/grub-dev.texi (Font Metrics): Exclude @image command from DVI

3
grub-core/kern/ia64/dl.c
View file

@ -115,7 +115,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
grub_uint64_t noff; grub_uint64_t noff;
grub_ia64_make_trampoline (tr, value); grub_ia64_make_trampoline (tr, value);
noff = ((char *) tr - (char *) (addr & ~3)) >> 4; noff = ((char *) tr - (char *) (addr & ~3)) >> 4;
tr = (struct grub_ia64_trampoline *) ((char *) tr + GRUB_IA64_DL_TRAMP_SIZE); tr++;
if (noff & ~MASK19) if (noff & ~MASK19)
return grub_error (GRUB_ERR_BAD_OS, return grub_error (GRUB_ERR_BAD_OS,
"trampoline offset too big (%lx)", noff); "trampoline offset too big (%lx)", noff);

2
grub-core/kern/ia64/dl_helper.c
View file

@ -152,8 +152,6 @@ static const grub_uint8_t jump[0x20] =
void void
grub_ia64_make_trampoline (struct grub_ia64_trampoline *tr, grub_uint64_t addr) 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)); grub_memcpy (tr->nop, nopm, sizeof (tr->nop));
tr->addr_hi[0] = ((addr & 0xc00000) >> 16); tr->addr_hi[0] = ((addr & 0xc00000) >> 16);
tr->addr_hi[1] = (addr >> 24) & 0xff; tr->addr_hi[1] = (addr >> 24) & 0xff;

1
include/grub/dl.h
View file

@ -240,7 +240,6 @@ void grub_arch_dl_init_linker (void);
#endif #endif
#define GRUB_IA64_DL_TRAMP_ALIGN 16 #define GRUB_IA64_DL_TRAMP_ALIGN 16
#define GRUB_IA64_DL_TRAMP_SIZE 48
#define GRUB_IA64_DL_GOT_ALIGN 16 #define GRUB_IA64_DL_GOT_ALIGN 16
grub_err_t grub_err_t