--- a/kernel/eka/nkernsmp/nkerns.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/nkernsmp/nkerns.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -47,15 +47,10 @@
 	iReady = 0;
 	iCurrent = 0;
 	iLastCpu = 0;
+	iNSchedulableSpare1 = 0;
 	iPauseCount = 0;
 	iSuspended = 0;
-	iACount = 0;
-	iPreferredCpu = 0;
-	iActiveState = 0;
-	i_NSchedulable_Spare2 = 0;
-	iTransientCpu = 0;
-	iForcedCpu = 0;
-	iLbState = ELbState_Inactive;
+	iNSchedulableSpare2 = 0;
 	iCpuChange = 0;
 	iStopping = 0;
 	iFreezeCpu = 0;
@@ -63,41 +58,14 @@
 	iCpuAffinity = 0;
 	new (i_IDfcMem) TDfc(&DeferredReadyIDfcFn, this);
 	iEventState = 0;
-	iRunCount.i64 = 0;
-	iLastRunTime.i64 = 0;
-	iTotalCpuTime.i64 = 0;
-	iLastActivationTime.i64 = 0;
-	iTotalActiveTime.i64 = 0;
-	iSavedCpuTime.i64 = 0;
-	iSavedActiveTime.i64 = 0;
-	iLbLink.iNext = 0;
-	memclr(&iLbInfo, EMaxLbInfoSize);
+	iTotalCpuTime64 = 0;
 	}
 
-void NSchedulable::AddToEnumerateList()
-	{
-	TScheduler& s = TheScheduler;
-	SIterDQ& dq = iParent ? s.iAllThreads : s.iAllGroups;
-	NKern::Lock();
-	s.iEnumerateLock.LockOnly();
-	dq.Add(&iEnumerateLink);
-	TUint32 active = s.iThreadAcceptCpus;
-	TUint32 cpus = active & iCpuAffinity;
-	if (!cpus)
-		cpus = active;	// can't run on any currently active CPU, just pick an active one until it becomes ready
-	TInt ecpu = __e32_find_ls1_32(cpus);
-	iEventState = (ecpu<<EEventCpuShift) | (ecpu<<EThreadCpuShift);
-	s.iEnumerateLock.UnlockOnly();
-	NKern::Unlock();
-	}
-
-
 /******************************************************************************
  * NThreadGroup
  ******************************************************************************/
 NThreadGroup::NThreadGroup()
 	{
-	iACount = 1;
 	iParent = 0;
 	iThreadCount = 0;
 	new (&iSSpinLock) TSpinLock(TSpinLock::EOrderThreadGroup);
@@ -111,10 +79,7 @@
 EXPORT_C TInt NKern::GroupCreate(NThreadGroup* aGroup, SNThreadGroupCreateInfo& aInfo)
 	{
 	new (aGroup) NThreadGroup();
-	aGroup->iDestructionDfc = aInfo.iDestructionDfc;
-	aGroup->iCpuAffinity = NSchedulable::PreprocessCpuAffinity(aInfo.iCpuAffinity);
-	aGroup->AddToEnumerateList();
-	aGroup->InitLbInfo();
+	aGroup->iCpuAffinity = aInfo.iCpuAffinity;
 	return KErrNone;
 	}
 
@@ -133,13 +98,6 @@
 	{
 	NKern::ThreadEnterCS();
 	aGroup->DetachTiedEvents();
-	NKern::Lock();
-	aGroup->AcqSLock();
-	if (aGroup->iLbLink.iNext)
-		aGroup->LbUnlink();
-	aGroup->RelSLock();
-	aGroup->DropRef();
-	NKern::Unlock();
 	NKern::ThreadLeaveCS();
 	}
 
@@ -178,10 +136,10 @@
 	iWaitLink.iPriority = 0;
 	iBasePri = 0;
 	iMutexPri = 0;
-	iNominalPri = 0;
+	i_NThread_Initial = 0;
 	iLinkedObjType = EWaitNone;
 	i_ThrdAttr = 0;
-	i_NThread_Initial = 0;
+	iNThreadBaseSpare10 = 0;
 	iFastMutexDefer = 0;
 	iRequestSemaphore.iOwningThread = (NThreadBase*)this;
 	iTime = 0;
@@ -202,15 +160,14 @@
 	iStackSize = 0;
 	iExtraContext = 0;
 	iExtraContextSize = 0;
-	iCoreCycling = 0;
-	iRebalanceAttr = 0;
-	iNThreadBaseSpare4c = 0;
-	iNThreadBaseSpare4d = 0;
-	iNThreadBaseSpare5 = 0;
 	iNThreadBaseSpare6 = 0;
 	iNThreadBaseSpare7 = 0;
 	iNThreadBaseSpare8 = 0;
 	iNThreadBaseSpare9 = 0;
+
+	// KILL
+	iTag = 0;
+	iVemsData = 0;
 	}
 
 TInt NThreadBase::Create(SNThreadCreateInfo& aInfo, TBool aInitial)
@@ -228,8 +185,7 @@
 	iTime=iTimeslice;
 	iPriority=TUint8(aInfo.iPriority);
 	iBasePri=TUint8(aInfo.iPriority);
-	iNominalPri=TUint8(aInfo.iPriority);
-	iCpuAffinity = NSchedulable::PreprocessCpuAffinity(aInfo.iCpuAffinity);
+	iCpuAffinity = aInfo.iCpuAffinity;
 	iHandlers = aInfo.iHandlers ? aInfo.iHandlers : &NThread_Default_Handlers;
 	iFastExecTable=aInfo.iFastExecTable?aInfo.iFastExecTable:&DefaultFastExecTable;
 	iSlowExecTable=(aInfo.iSlowExecTable?aInfo.iSlowExecTable:&DefaultSlowExecTable)->iEntries;
@@ -242,9 +198,8 @@
 		iCurrent = iReady;
 		iCpuAffinity = iLastCpu;
 		iEventState = (iLastCpu<<EEventCpuShift) | (iLastCpu<<EThreadCpuShift);
-		i_NThread_Initial = TRUE;	// must set initial thread flag before adding to subscheduler
-		ss.SSAddEntry(this);		// in order to get correct ready thread count (i.e. not including the idle thread)
-		iACount = 1;
+		ss.Add(this);
+		i_NThread_Initial = TRUE;
 		ss.iInitialThread = (NThread*)this;
 		NKern::Unlock();		// now that current thread is defined
 		}
@@ -252,7 +207,16 @@
 		{
 		iSuspendCount = 1;
 		iSuspended = 1;
-		iEventState = 0;
+		TInt ecpu;
+		if (iCpuAffinity & NTHREADBASE_CPU_AFFINITY_MASK)
+			{
+			ecpu = __e32_find_ls1_32(iCpuAffinity);
+			if (ecpu >= TheScheduler.iNumCpus)
+				ecpu = 0;	// FIXME: Inactive CPU?
+			}
+		else
+			ecpu = iCpuAffinity;
+		iEventState = (ecpu<<EEventCpuShift) | (ecpu<<EThreadCpuShift);
 		if (aInfo.iGroup)
 			{
 			NKern::Lock();
@@ -283,19 +247,6 @@
 	ExcFault(aContext);
 	}
 
-//
-// Destroy a thread before it has ever run
-// Must be called before first resumption of thread
-//
-void NThread::Stillborn()
-	{
-	__NK_ASSERT_ALWAYS(iACount==0);	// ensure thread has never been resumed
-	NKern::Lock();
-	RemoveFromEnumerateList();
-	NKern::Unlock();
-	}
-
-
 
 /** Create a nanothread.
 
@@ -319,10 +270,8 @@
 	return aThread->Create(aInfo,FALSE);
 	}
 
+// User-mode callbacks
 
-/******************************************************************************
- * User-mode callbacks
- ******************************************************************************/
 TUserModeCallback::TUserModeCallback(TUserModeCallbackFunc aFunc)
 	:	iNext(KUserModeCallbackUnqueued),
 		iFunc(aFunc)
@@ -380,7 +329,6 @@
 	NKern::Unlock();
 	}
 
-
 /** Initialise the null thread
 	@internalComponent
 */
@@ -530,15 +478,3 @@
 	return 0;
 #endif
 	}
-
-TDfcQue* TScheduler::RebalanceDfcQ()
-	{
-	return TheScheduler.iRebalanceDfcQ;
-	}
-
-NThread* TScheduler::LBThread()
-	{
-	TDfcQue* rbQ = TheScheduler.iRebalanceDfcQ;
-	return rbQ ? (NThread*)(rbQ->iThread) : 0;
-	}
-