Index: generic/src/cpu/cpu.c
===================================================================
--- generic/src/cpu/cpu.c	(revision 5c9a08b46f360925ecb95360eb2b35b88a5f8087)
+++ generic/src/cpu/cpu.c	(revision 89298e36479568f5ea9680f5cfd750723dafbbdd)
@@ -30,5 +30,5 @@
 #include <arch.h>
 #include <arch/cpu.h>
-#include <mm/heap.h>
+#include <mm/slab.h>
 #include <mm/page.h>
 #include <mm/frame.h>
@@ -62,5 +62,5 @@
 
 		for (i=0; i < config.cpu_count; i++) {
-			cpus[i].stack = (__u8 *) frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC);
+			cpus[i].stack = (__u8 *) PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC)));
 			
 			cpus[i].id = i;