Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
+++ kernel/generic/src/main/main.c	(revision 6e49dabfec8b39f3cfff6b845af4e23c6f1d973c)
@@ -328,5 +328,5 @@
 	ARCH_OP(post_cpu_init);
 
-	current_copy(CURRENT, (current_t *) CPU->stack);
+	current_copy(CURRENT, (current_t *) CPU_LOCAL->stack);
 
 	/*
@@ -338,5 +338,5 @@
 	context_save(&ctx);
 	context_set(&ctx, FADDR(main_ap_separated_stack),
-	    (uintptr_t) CPU->stack, STACK_SIZE);
+	    (uintptr_t) CPU_LOCAL->stack, STACK_SIZE);
 	context_restore(&ctx);
 	/* not reached */