2 files changed, 4 insertions, 4 deletions
diff --git a/os/kernel/src/chregistry.c b/os/kernel/src/chregistry.c
index ad5cd7fc1..c561d8ca6 100644
--- a/os/kernel/src/chregistry.c
+++ b/os/kernel/src/chregistry.c
@@ -64,7 +64,7 @@ Thread *chRegFirstThread(void) {
   Thread *tp;
 
   chSysLock();
-  tp = rlist.p_newer;
+  tp = rlist.r_newer;
 #if CH_USE_DYNAMIC
   tp->p_refs++;
 #endif
diff --git a/os/kernel/src/chschd.c b/os/kernel/src/chschd.c
index 7170fb0ec..cee046af2 100644
--- a/os/kernel/src/chschd.c
+++ b/os/kernel/src/chschd.c
@@ -51,7 +51,7 @@ void scheduler_init(void) {
   rlist.r_preempt = CH_TIME_QUANTUM;
 #endif
 #if CH_USE_REGISTRY
-  rlist.p_newer = rlist.p_older = (Thread *)&rlist;
+  rlist.r_newer = rlist.r_older = (Thread *)&rlist;
 #endif
 }
 
@@ -96,11 +96,11 @@ void chSchGoSleepS(tstate_t newstate) {
   Thread *otp;
 
   (otp = currp)->p_state = newstate;
-  setcurrp(fifo_remove(&rlist.r_queue));
-  currp->p_state = THD_STATE_CURRENT;
 #if CH_TIME_QUANTUM > 0
   rlist.r_preempt = CH_TIME_QUANTUM;
 #endif
+  setcurrp(fifo_remove(&rlist.r_queue));
+  currp->p_state = THD_STATE_CURRENT;
   chDbgTrace(currp, otp);
   chSysSwitchI(currp, otp);
 }