Message ID | 1439580404-26574-1-git-send-email-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
On Fri, Aug 14, 2015 at 01:26:43PM -0600, Simon Glass wrote: > This should use the align parameter, not bytes. Natural alignment is one > use case but should not be the only one supported by this function. > > Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
On Fri, Aug 14, 2015 at 01:26:43PM -0600, Simon Glass wrote: > This should use the align parameter, not bytes. Natural alignment is one > use case but should not be the only one supported by this function. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/common/malloc_simple.c b/common/malloc_simple.c index 9811ab6..134e059 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -31,7 +31,7 @@ void *memalign_simple(size_t align, size_t bytes) ulong addr, new_ptr; void *ptr; - addr = ALIGN(gd->malloc_base + gd->malloc_ptr, bytes); + addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align); new_ptr = addr + bytes; if (new_ptr > gd->malloc_limit) return NULL;
This should use the align parameter, not bytes. Natural alignment is one use case but should not be the only one supported by this function. Signed-off-by: Simon Glass <sjg@chromium.org> --- common/malloc_simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)