Index: kernel/generic/src/cpu/cpu.c
===================================================================
--- kernel/generic/src/cpu/cpu.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
+++ kernel/generic/src/cpu/cpu.c	(revision e82879c8ac18233b45e32938c1e9b4aeb9b54a70)
@@ -81,5 +81,5 @@
 				panic("Cannot allocate CPU stack.");
 
-			cpus[i].stack = (uint8_t *) PA2KA(stack_phys);
+			cpus[i].local.stack = (uint8_t *) PA2KA(stack_phys);
 			cpus[i].id = i;
 
@@ -104,6 +104,6 @@
 	CPU->tlb_active = true;
 
-	CPU->idle = false;
-	CPU->last_cycle = get_cycle();
+	CPU_LOCAL->idle = false;
+	CPU_LOCAL->last_cycle = get_cycle();
 	CPU->idle_cycles = ATOMIC_TIME_INITIALIZER();
 	CPU->busy_cycles = ATOMIC_TIME_INITIALIZER();