aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-10-11 07:42:52 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-10-11 07:42:52 +0000
commit491e3756b8589e333a7d7b256ecce50df0f3fff9 (patch)
treed49bc5881a52635eb7b58b81ce6411daeb5591bf
parent25cecf6e7ef75e0ac60d13177dfc7fbfbfcf55b2 (diff)
downloadChibiOS-491e3756b8589e333a7d7b256ecce50df0f3fff9.tar.gz
ChibiOS-491e3756b8589e333a7d7b256ecce50df0f3fff9.tar.bz2
ChibiOS-491e3756b8589e333a7d7b256ecce50df0f3fff9.zip
Fixed bug #896.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10809 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/common/oslib/include/chmemcore.h2
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/os/common/oslib/include/chmemcore.h b/os/common/oslib/include/chmemcore.h
index aaaf22a9f..ae5da6753 100644
--- a/os/common/oslib/include/chmemcore.h
+++ b/os/common/oslib/include/chmemcore.h
@@ -192,7 +192,7 @@ static inline void *chCoreAllocI(size_t size) {
*/
static inline void *chCoreAlloc(size_t size) {
- return chCoreAllocAlignedWithOffsetI(size, PORT_NATURAL_ALIGN, 0U);
+ return chCoreAllocAlignedWithOffset(size, PORT_NATURAL_ALIGN, 0U);
}
#endif /* CH_CFG_USE_MEMCORE == TRUE */
diff --git a/readme.txt b/readme.txt
index d1a8d6830..c46aabcf5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -134,6 +134,8 @@
dependencies and configuration directories. This makes possible
to have multiple non-conflicting makefiles in the same project.
Updated the various platform.mk implementing "smart build" mode.
+- LIB: Fixed call protocol violation in chCoreAlloc() (bug #896)(backported
+ to 17.6.3).
- RT: Fixed trace Buffer activation bits state reversed in chconf.h
(bug #895)(backported to 17.6.3).
- BLD: Fixed USE_OPT not passed to assembler in rules.mk (bug #892)(backported