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

* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Remove

Browse source 
redundant buggy overlap check.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-13 16:55:20 +02:00
parent 16fc9293d6
commit ee5207750f
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-04-13 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Remove
redundant buggy overlap check.
2012-04-11 Vladimir Serbinenko <phcoder@gmail.com> 2012-04-11 Vladimir Serbinenko <phcoder@gmail.com>
* tests/util/grub-shell.in: Set pkgdatadir when calling grub-mkrescue * tests/util/grub-shell.in: Set pkgdatadir when calling grub-mkrescue

6
grub-core/lib/relocator.c
View file

@ -1425,12 +1425,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
for (chunk2 = rel->chunks; chunk2; chunk2 = chunk2->next) for (chunk2 = rel->chunks; chunk2; chunk2 = chunk2->next)
if ((chunk2->target <= chunk->target if ((chunk2->target <= chunk->target
&& chunk->target < chunk2->target + chunk2->size) && chunk->target < chunk2->target + chunk2->size)
|| (chunk2->target <= chunk->target + size
&& chunk->target + size < chunk2->target + chunk2->size)
|| (chunk->target <= chunk2->target && chunk2->target || (chunk->target <= chunk2->target && chunk2->target
< chunk->target + size) < chunk->target + size))
|| (chunk->target <= chunk2->target + chunk2->size
&& chunk2->target + chunk2->size < chunk->target + size))
{ {
if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH) if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
chunk->target = ALIGN_DOWN (chunk2->target, align); chunk->target = ALIGN_DOWN (chunk2->target, align);