1 files changed, 3 insertions, 4 deletions
diff --git a/os/kernel/src/chmempools.c b/os/kernel/src/chmempools.c
index 092944b59..38adc3d49 100644
--- a/os/kernel/src/chmempools.c
+++ b/os/kernel/src/chmempools.c
@@ -1,5 +1,6 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011 Giovanni Di Sirio.
 
     This file is part of ChibiOS/RT.
 
@@ -55,7 +56,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;
 }
 
@@ -75,10 +76,8 @@ void *chPoolAllocI(MemoryPool *mp) {
 
   if ((objp = mp->mp_next) != NULL)
     mp->mp_next = mp->mp_next->ph_next;
-#if CH_USE_MEMCORE
   else if (mp->mp_provider != NULL)
     objp = mp->mp_provider(mp->mp_object_size);
-#endif
   return objp;
 }