From d532ad93a42ea95460765d4527b3fb1e4544c154 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sat, 28 Feb 2015 20:57:27 -0500 Subject: fix logic bug --- kernel/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/heap.c b/kernel/heap.c index 947d0db..bb18fb4 100644 --- a/kernel/heap.c +++ b/kernel/heap.c @@ -20,7 +20,8 @@ static void *kmalloc_int(size_t sz, int align, void **phys) *phys = (void*)kmalloc_addr; void *ret = (void*)kmalloc_addr; kmalloc_addr += sz; - assert(((uint32_t)ret & 0xFFF) == 0); + /* make sure the address is aligned if requested */ + assert(!align || (((uint32_t)ret & 0xFFF) == 0)); return ret; } -- cgit v1.1