adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LMB]: Fix bug in __lmb_alloc_base().

Browse source 
We need to check lmb_add_region() for errors, it can run out
of regions etc.

Also, the size needs to be padded to the given alignment
or else the lmb.reserved regions don't get expanded and
instead we get tons of holes and eventually run out of
regions prematurely.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-02-13 16:57:09 -08:00
parent d9b2b2a277
commit eea89e13a9
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/lmb.c
View file

@ -245,6 +245,11 @@ static unsigned long lmb_align_down(unsigned long addr, unsigned long size)
return addr & ~(size - 1); return addr & ~(size - 1);
} }
static unsigned long lmb_align_up(unsigned long addr, unsigned long size)
{
return (addr + (size - 1)) & ~(size - 1);
}
unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align, unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
unsigned long max_addr) unsigned long max_addr)
{ {
@ -281,7 +286,8 @@ unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
if (i < 0) if (i < 0)
return 0; return 0;
lmb_add_region(&lmb.reserved, base, size); if (lmb_add_region(&lmb.reserved, base, lmb_align_up(size, align)) < 0)
return 0;
return base; return base;
} }