2 files changed, 6 insertions, 1 deletions
diff --git a/os/rt/src/chsys.c b/os/rt/src/chsys.c
index fd47664a5..a22a66482 100644
--- a/os/rt/src/chsys.c
+++ b/os/rt/src/chsys.c
@@ -132,6 +132,12 @@ void chSysInit(void) {
      adjacent to its stack area.*/
   currp->p_stklimit = &__main_thread_stack_base__;
 #endif
+
+#if CH_DBG_STATISTICS == TRUE
+  /* Starting measurement for this thread.*/
+  chTMStartMeasurementX(&currp->p_stats);
+#endif
+
   chSysEnable();
 
 #if CH_CFG_USE_REGISTRY == TRUE
diff --git a/os/rt/src/chthreads.c b/os/rt/src/chthreads.c
index 9c18788c0..b616ffd92 100644
--- a/os/rt/src/chthreads.c
+++ b/os/rt/src/chthreads.c
@@ -124,7 +124,6 @@ thread_t *_thread_init(thread_t *tp, tprio_t prio) {
 #endif
 #if CH_DBG_STATISTICS == TRUE
   chTMObjectInit(&tp->p_stats);
-  chTMStartMeasurementX(&tp->p_stats);
 #endif
 #if defined(CH_CFG_THREAD_INIT_HOOK)
   CH_CFG_THREAD_INIT_HOOK(tp);