2 files changed, 3 insertions, 3 deletions
diff --git a/os/rt/src/chsys.c b/os/rt/src/chsys.c
index 4ddbe41ce..921010066 100644
--- a/os/rt/src/chsys.c
+++ b/os/rt/src/chsys.c
@@ -57,7 +57,7 @@ ch_system_t ch;
 /**
  * @brief   Idle thread working area.
  */
-static WORKING_AREA(_idle_thread_wa, CH_PORT_IDLE_THREAD_STACK_SIZE);
+static THD_WORKING_AREA(_idle_thread_wa, PORT_IDLE_THREAD_STACK_SIZE);
 #endif /* CH_CFG_NO_IDLE_THREAD */
 
 /*===========================================================================*/
diff --git a/os/rt/src/chthreads.c b/os/rt/src/chthreads.c
index 13e4c0346..051cf0cc3 100644
--- a/os/rt/src/chthreads.c
+++ b/os/rt/src/chthreads.c
@@ -181,10 +181,10 @@ thread_t *chThdCreateI(void *wsp, size_t size,
   thread_t *tp = wsp;
 
   chDbgCheckClassI();
-
   chDbgCheck((wsp != NULL) && (size >= THD_WA_SIZE(0)) &&
              (prio <= HIGHPRIO) && (pf != NULL));
-  SETUP_CONTEXT(wsp, size, pf, arg);
+
+  PORT_SETUP_CONTEXT(wsp, size, pf, arg);
   return _thread_init(tp, prio);
 }