--- a/kernel/eka/include/nkern/nk_trace.h	Tue Feb 02 01:24:03 2010 +0200
+++ b/kernel/eka/include/nkern/nk_trace.h	Fri Apr 16 16:24:37 2010 +0300
@@ -360,6 +360,11 @@
 */
 #define KPIPE	58 //0x04000000, index 1
 
+/**
+@internalComponent
+*/
+#define KSCHED3	48 //0x00010000, index 1
+
 // RESERVED: Trace bits 192 - 255 are reserved for licensee partners
 
 
@@ -574,7 +579,7 @@
 @publishedPartner
 @released 9.4
 */
-#if defined(__MEMMODEL_MOVING__) || defined (__MEMMODEL_MULTIPLE__)
+#if !defined(__MEMMODEL_DIRECT__) && !defined (__MEMMODEL_EMUL_SINGLE_HOST_PROCESS__)
 #define BTRACE_RAM_ALLOCATOR
 #endif
 
@@ -620,7 +625,9 @@
 
 This BTrace category is only supported on the flexible memory model.
 */
+#ifdef __MEMMODEL_FLEXIBLE__
 #define BTRACE_FLEXIBLE_MEM_MODEL
+#endif
 
 /**
 If defined, code for BTrace category BTrace::EIic is compiled into the