--- a/kernel/eka/include/memmodel/epoc/multiple/memmodel.h	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/include/memmodel/epoc/multiple/memmodel.h	Wed Sep 01 12:34:56 2010 +0100
@@ -24,8 +24,8 @@
 
 #ifdef __SMP__
 // SubScheduler fields for each processor
-#define	i_AliasLinAddr			iSubSchedScratch[0]
-#define	i_AliasPdePtr			iSubSchedScratch[1]
+#define	i_AliasLinAddr			iExtras[0]
+#define	i_AliasPdePtr			iExtras[1]
 #endif
 
 /********************************************
@@ -45,19 +45,6 @@
  * RAM Defrag Page Table Moving Support
  ********************************************/
 
-#ifdef __SMP__
-/**
-@internalComponent
-*/
-#define AliasRemapOld					((TPhysAddr&)TheScheduler.iSchedScratch[1])
-
-/**
-@internalComponent
-*/
-#define AliasRemapNew					((TPhysAddr&)TheScheduler.iSchedScratch[2])
-
-#else
-
 /**
 @internalComponent
 */
@@ -67,7 +54,6 @@
 @internalComponent
 */
 #define AliasRemapNew					((TPhysAddr&)TheScheduler.iExtras[2])
-#endif
 
 /********************************************
  * Thread Control Block