From 8359e7be774c7286686042f0a5e86e862bfeef68 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 5 Nov 2017 11:46:18 +0000
Subject: Fixed bug #902.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10960 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/nil/src/ch.c | 10 ++++++++++
 readme.txt      |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/os/nil/src/ch.c b/os/nil/src/ch.c
index 2c9a61279..cbae55c46 100644
--- a/os/nil/src/ch.c
+++ b/os/nil/src/ch.c
@@ -260,11 +260,21 @@ void chSysInit(void) {
   nil.lock_cnt = (cnt_t)1;
 #endif
 
+  /* Memory core initialization, if enabled.*/
+#if CH_CFG_USE_MEMCORE == TRUE
+  _core_init();
+#endif
+
   /* Heap initialization, if enabled.*/
 #if CH_CFG_USE_HEAP == TRUE
   _heap_init();
 #endif
 
+  /* Factory initialization, if enabled.*/
+#if CH_CFG_USE_FACTORY == TRUE
+  _factory_init();
+#endif
+
   /* Port layer initialization last because it depend on some of the
      initializations performed before.*/
   port_init();
diff --git a/readme.txt b/readme.txt
index c7317cf9d..8f2e276a2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -150,6 +150,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.
+- NIL: Fixed core and Heap allocators not functional in NIL (bug #902)
+       (backported to 17.6.3).
 - HAL: Fixed function uartSendFullTimeout() failing on STM32 USARTv1 and
        v2 drivers (bug #901)(backported to 17.6.3 and 16.1.10).
 - HAL: Fixed broken I2C fallback driver (bug #900)(backported to 17.6.3).
-- 
cgit v1.2.3