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

Align scratch

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-22 00:52:33 +02:00
parent bf5f1dc6d2
commit 67c4bb722d
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
grub-core/boot/decompressor/minilib.c
View file

@ -87,13 +87,16 @@ find_scratch (void *src, void *dst, unsigned long srcsize,
/* Decoding from ROM. */ /* Decoding from ROM. */
if (((grub_addr_t) src & 0x10000000)) if (((grub_addr_t) src & 0x10000000))
{ {
grub_decompressor_scratch = (char *) dst + dstsize; grub_decompressor_scratch = (void *) ALIGN_UP((grub_addr_t) dst + dstsize,
256);
return; return;
} }
#endif #endif
if ((char *) src + srcsize > (char *) dst + dstsize) if ((char *) src + srcsize > (char *) dst + dstsize)
grub_decompressor_scratch = (char *) src + srcsize; grub_decompressor_scratch = (void *) ALIGN_UP ((grub_addr_t) src + srcsize,
256);
else else
grub_decompressor_scratch = (char *) dst + dstsize; grub_decompressor_scratch = (void *) ALIGN_UP ((grub_addr_t) dst + dstsize,
256);
return; return;
} }