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

* kern/mm.c (grub_real_malloc): Satisfy alignment requirement when

Browse source 
extra == 0.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-01 19:39:32 +02:00
commit 88c14915f8
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-05-01 Vladimir Serbinenko <phcoder@gmail.com>
* kern/mm.c (grub_real_malloc): Satisfy alignment requirement when
extra == 0.
2010-05-01 Vladimir Serbinenko <phcoder@gmail.com> 2010-05-01 Vladimir Serbinenko <phcoder@gmail.com>
* commands/iorw.c: New file. * commands/iorw.c: New file.

16
kern/mm.c
View file

@ -223,7 +223,7 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
q->next = p->next; q->next = p->next;
p->magic = GRUB_MM_ALLOC_MAGIC; p->magic = GRUB_MM_ALLOC_MAGIC;
} }
else if (extra == 0 || p->size == n + extra) else if (align == 1 || p->size == n + extra)
{ {
/* There might be alignment requirement, when taking it into /* There might be alignment requirement, when taking it into
account memory block fits in. account memory block fits in.
@ -240,11 +240,25 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
| alloc, size=n | | | alloc, size=n | |
+---------------+ v +---------------+ v
*/ */
p->size -= n; p->size -= n;
p += p->size; p += p->size;
p->size = n; p->size = n;
p->magic = GRUB_MM_ALLOC_MAGIC; p->magic = GRUB_MM_ALLOC_MAGIC;
} }
else if (extra == 0)
{
grub_mm_header_t r;
p->magic = GRUB_MM_ALLOC_MAGIC;
p->size = n;
r = p + extra + n;
r->magic = GRUB_MM_FREE_MAGIC;
r->size = p->size - extra - n;
r->next = p->next;
q->next = r;
}
else else
{ {
/* There is alignment requirement and there is room in memory /* There is alignment requirement and there is room in memory