aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-02-23 20:24:05 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-02-23 20:24:05 +0000
commita55d3c6e6b8d14d6310382f149593df231925c17 (patch)
treed9e52169503791abdb630dd2c250d0e29108c83b
parent658872aee02153b2b6c77a2df935f4dbe6590fc9 (diff)
downloadChibiOS-a55d3c6e6b8d14d6310382f149593df231925c17.tar.gz
ChibiOS-a55d3c6e6b8d14d6310382f149593df231925c17.tar.bz2
ChibiOS-a55d3c6e6b8d14d6310382f149593df231925c17.zip
Fixed bug 3190512.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2761 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/kernel/src/chmempools.c2
-rw-r--r--readme.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/os/kernel/src/chmempools.c b/os/kernel/src/chmempools.c
index 092944b59..054823af0 100644
--- a/os/kernel/src/chmempools.c
+++ b/os/kernel/src/chmempools.c
@@ -75,10 +75,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;
}
diff --git a/readme.txt b/readme.txt
index 4ca9da65d..3d91239d1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -69,6 +69,8 @@
*****************************************************************************
*** 2.3.0 ***
+- FIX: Fixed minor problem with memory pools (bug 3190512)(backported to
+ 2.2.1).
- FIX: Stack overflow in CM0 ports when nearing interrupts saturation (bug
3187105)(backported to 2.2.1).
- FIX: Fixed error in _BSEMAPHORE_DATA macro (bug 3184139)(backported to