--- a/kernel/eka/kernel/ekern.mmp	Mon May 03 13:47:38 2010 +0300
+++ b/kernel/eka/kernel/ekern.mmp	Fri May 14 17:13:29 2010 +0300
@@ -50,6 +50,7 @@
 // we have to keep this here, and not in kern_int.mmh, because media drivers
 // use the same macro name for different puposes...
 macro __DEMAND_PAGING__
+macro __DEMAND_PAGING_BENCHMARKS__
 #endif
 
 
@@ -85,7 +86,7 @@
 sourcepath				../klib/arm
 source					 ckdes8.cia cumem.cia cbma.cia
 sourcepath				../common/arm
-source					carray.cia cdes8.cia cheap.cia cmem.cia
+source					carray.cia cdes8.cia cmem.cia
 #if defined(GCC32)
 source 					cgcchelp.cpp cgcchelp.cia
 #elif defined(ARMCC)
@@ -164,7 +165,8 @@
 source					kheap.cpp bma.cpp
 
 sourcepath				../common
-source					alloc.cpp array.cpp des8.cpp heap.cpp mem.cpp
+source					alloc.cpp array.cpp des8.cpp mem.cpp
+source					heap_hybrid.cpp debugfunction.cpp   
 source					secure.cpp
 macro					__EXPORT_MEMCPY__
 #ifdef MARM