Index: kernel/generic/include/config.h
===================================================================
--- kernel/generic/include/config.h	(revision 04357767a90c7f3afb5035aee20bc56c354efbb8)
+++ kernel/generic/include/config.h	(revision 9cc1f43c8a2e01d87715d8b99cc5dec3f2180795)
@@ -36,11 +36,19 @@
 #define KERN_CONFIG_H_
 
-#include <typedefs.h>
 #include <arch/mm/page.h>
 
-#define STACK_SIZE  PAGE_SIZE
+#define ONE_FRAME    0
+#define TWO_FRAMES   1
+#define FOUR_FRAMES  2
+
+#define STACK_FRAMES  TWO_FRAMES
+#define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
 
 #define CONFIG_INIT_TASKS        32
 #define CONFIG_TASK_NAME_BUFLEN  32
+
+#ifndef __ASM__
+
+#include <typedefs.h>
 
 typedef struct {
@@ -80,4 +88,6 @@
 extern ballocs_t ballocs;
 
+#endif /* __ASM__ */
+
 #endif