Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 31e15be68a47a029289a467b6b9f837763fe97c1)
+++ kernel/generic/src/proc/scheduler.c	(revision aae2869ce92cf8890c7625c4b51691f02993d436)
@@ -236,6 +236,11 @@
 
 		thread->cpu = CPU;
-		thread->ticks = us2ticks((i + 1) * 10000);
 		thread->priority = i;  /* Correct rq index */
+
+		/* Time allocation in microseconds. */
+		uint64_t time_to_run = (i + 1) * 10000;
+
+		/* This is safe because interrupts are disabled. */
+		CPU->preempt_deadline = CPU->current_clock_tick + us2ticks(time_to_run);
 
 		/*