Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision 24345a57fd6f125f17c733469f41fb22765b51c8)
+++ kernel/generic/src/main/main.c	(revision aa8d0f724e941934ba8a46d05e4ec1c71954987a)
@@ -329,4 +329,5 @@
 	 * switch to this cpu's private stack prior to waking kmp up.
 	 */
+	context_save(&CPU->saved_context);
 	context_set(&CPU->saved_context, FADDR(main_ap_separated_stack),
 	    (uintptr_t) CPU->stack, CPU_STACK_SIZE);