--- a/kernel/eka/kernel/x86/cutils.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/kernel/x86/cutils.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -102,12 +102,11 @@
 	{
 	if (aPhase==0)
 		{
-		Cache::CpuRetires();
+		Cache::AtomicSyncMemory();
 		return;
 		}
-	Cache::KernelRetires();
 #ifdef __SMP__
-	SFullX86RegSet* regs = &(((SCpuData*)SubScheduler().iSSX.iTss)->iRegs);
+	SFullX86RegSet* regs = &(((SCpuData*)SubScheduler().i_Tss)->iRegs);
 #else
 	SFullX86RegSet* regs = &X86_Regs;
 #endif
@@ -120,7 +119,7 @@
 void A::StartCrashDebugger(const TAny* a0, TInt a1)
 	{
 #ifdef __SMP__
-	SFullX86RegSet* regs = &(((SCpuData*)SubScheduler().iSSX.iTss)->iRegs);
+	SFullX86RegSet* regs = &(((SCpuData*)SubScheduler().i_Tss)->iRegs);
 #else
 	SFullX86RegSet* regs = &X86_Regs;
 #endif
@@ -151,8 +150,8 @@
 	TInt i;
 	for (i=0; i<KMaxCpus; ++i)
 		{
-		TheSubSchedulers[i].iSSX.iCrashState = f;
-		TheSubSchedulers[i].iSSX.iExcInfo = (TAny*)aMode;
+		TheSubSchedulers[i].i_CrashState = (TAny*)f;
+		TheSubSchedulers[i].i_ExcInfo = (TAny*)aMode;
 		}
 	write_apic_reg(ICRH, 0);
 	write_apic_reg(ICRL, 0xC4400);	// send NMI to all processors other than this one - will call vector