Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 8d308b91dd790ada0c5d8348bda8fc122a39f6b6)
+++ kernel/generic/include/mm/as.h	(revision 712c4bac34d2d8ac8d7e35e7e48ff1c293c0ffb8)
@@ -84,5 +84,9 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#ifdef USTACK_ADDRESS_ARCH
+	#define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#else
+	#define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
+#endif
 
 /** Kernel address space. */
Index: kernel/generic/include/mm/frame.h
===================================================================
--- kernel/generic/include/mm/frame.h	(revision 8d308b91dd790ada0c5d8348bda8fc122a39f6b6)
+++ kernel/generic/include/mm/frame.h	(revision 712c4bac34d2d8ac8d7e35e7e48ff1c293c0ffb8)
@@ -44,15 +44,4 @@
 #include <arch/mm/page.h>
 #include <arch/mm/frame.h>
-
-#define ONE_FRAME    0
-#define TWO_FRAMES   1
-#define FOUR_FRAMES  2
-
-
-#ifdef ARCH_STACK_FRAMES
-	#define STACK_FRAMES  ARCH_STACK_FRAMES
-#else
-	#define STACK_FRAMES  ONE_FRAME
-#endif
 
 /** Maximum number of zones in the system. */