From 22856e608352bdffcd52e1f71c62703f429c9c76 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 26 Feb 2011 14:27:01 +0000
Subject: [PATCH] git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@2770
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/kernel/src/chheap.c     | 2 +-
 os/kernel/src/chmempools.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/os/kernel/src/chheap.c b/os/kernel/src/chheap.c
index 88ce4f47d..bcc1bf894 100644
--- a/os/kernel/src/chheap.c
+++ b/os/kernel/src/chheap.c
@@ -132,7 +132,7 @@ void *chHeapAlloc(MemoryHeap *heapp, size_t size) {
   if (heapp == NULL)
     heapp = &default_heap;
 
-  size = MEM_ALIGN_SIZE(size);
+  size = MEM_ALIGN_NEXT(size);
   qp = &heapp->h_free;
   H_LOCK(heapp);
 
diff --git a/os/kernel/src/chmempools.c b/os/kernel/src/chmempools.c
index c1c8c309f..7509f84da 100644
--- a/os/kernel/src/chmempools.c
+++ b/os/kernel/src/chmempools.c
@@ -62,7 +62,7 @@ void chPoolInit(MemoryPool *mp, size_t size, memgetfunc_t provider) {
   chDbgCheck((mp != NULL) && (size >= sizeof(void *)), "chPoolInit");
 
   mp->mp_next = NULL;
-  mp->mp_object_size = MEM_ALIGN_SIZE(size);
+  mp->mp_object_size = MEM_ALIGN_NEXT(size);
   mp->mp_provider = provider;
 }