aboutsummaryrefslogtreecommitdiffstats
path: root/os/kernel/src
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-05-19 09:13:24 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-05-19 09:13:24 +0000
commit5e1249af266c9688ec575e5a2f14ecfe6084de49 (patch)
treecaa2477037b299f92860d734bf2750987478c8e4 /os/kernel/src
parent807c5f1882224c2afd471a44889b83c2adf80589 (diff)
downloadChibiOS-5e1249af266c9688ec575e5a2f14ecfe6084de49.tar.gz
ChibiOS-5e1249af266c9688ec575e5a2f14ecfe6084de49.tar.bz2
ChibiOS-5e1249af266c9688ec575e5a2f14ecfe6084de49.zip
Fixed bug 3303841.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2973 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/kernel/src')
-rw-r--r--os/kernel/src/chheap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/os/kernel/src/chheap.c b/os/kernel/src/chheap.c
index bcfca9b77..b90b21909 100644
--- a/os/kernel/src/chheap.c
+++ b/os/kernel/src/chheap.c
@@ -80,6 +80,8 @@ void _heap_init(void) {
* @brief Initializes a memory heap from a static memory area.
* @pre Both the heap buffer base and the heap size must be aligned to
* the @p stkalign_t type size.
+ * @pre In order to use this function the option @p CH_USE_MALLOC_HEAP
+ * must be disabled.
*
* @param[out] heapp pointer to the memory heap descriptor to be initialized
* @param[in] buf heap buffer base
@@ -271,7 +273,7 @@ static Mutex hmtx;
static Semaphore hsem;
#endif
-void heap_init(void) {
+void _heap_init(void) {
#if CH_USE_MUTEXES
chMtxInit(&hmtx);