Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 128359ebc085c950da1f7e34c3928f12654b438f)
+++ kernel/generic/src/proc/scheduler.c	(revision ee2f0bebcbd1e2ecc6efffb33da7df3c9c6404f5)
@@ -610,7 +610,7 @@
 
 			/* Search rq from the back */
-			link_t *link = cpu->rq[rq].rq.head.prev;
-
-			while (link != &(cpu->rq[rq].rq.head)) {
+			link_t *link = list_last(&cpu->rq[rq].rq);
+
+			while (link != NULL) {
 				thread = (thread_t *) list_get_instance(link,
 				    thread_t, rq_link);
@@ -644,5 +644,5 @@
 				irq_spinlock_unlock(&thread->lock, false);
 
-				link = link->prev;
+				link = list_prev(link, &cpu->rq[rq].rq);
 				thread = NULL;
 			}