Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision 8d308b91dd790ada0c5d8348bda8fc122a39f6b6)
+++ kernel/generic/src/main/main.c	(revision 6fe0bf8de5aa2032128982d03e2f8b3240b3e508)
@@ -118,6 +118,4 @@
 #endif
 
-#define CONFIG_STACK_SIZE  ((1 << STACK_FRAMES) * STACK_SIZE)
-
 /** Main kernel routine for bootstrap CPU.
  *
@@ -139,5 +137,5 @@
 	config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
 	    hardcoded_kdata_size, PAGE_SIZE);
-	config.stack_size = CONFIG_STACK_SIZE;
+	config.stack_size = STACK_SIZE;
 	
 	/* Initialy the stack is placed just after the kernel */
@@ -165,6 +163,6 @@
 	
 	context_save(&ctx);
-	context_set(&ctx, FADDR(main_bsp_separated_stack), config.stack_base,
-	    THREAD_STACK_SIZE);
+	context_set(&ctx, FADDR(main_bsp_separated_stack),
+	    config.stack_base, STACK_SIZE);
 	context_restore(&ctx);
 	/* not reached */
@@ -323,5 +321,5 @@
 	context_save(&CPU->saved_context);
 	context_set(&CPU->saved_context, FADDR(main_ap_separated_stack),
-	    (uintptr_t) CPU->stack, CPU_STACK_SIZE);
+	    (uintptr_t) CPU->stack, STACK_SIZE);
 	context_restore(&CPU->saved_context);
 	/* not reached */