From a5f45afa6c2f39d00951d01a0a4a2865b4b80059 Mon Sep 17 00:00:00 2001
From: Pawel Dziepak <pdziepak@quarnos.org>
Date: Mon, 6 Jan 2014 07:35:36 +0100
Subject: [PATCH] scheduler: Remove unnecessary check against disabled CPU

---
 src/system/kernel/scheduler/scheduler.cpp     | 8 ++++----
 src/system/kernel/scheduler/scheduler_cpu.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/system/kernel/scheduler/scheduler.cpp b/src/system/kernel/scheduler/scheduler.cpp
index 646c756ad6..ca67208868 100644
--- a/src/system/kernel/scheduler/scheduler.cpp
+++ b/src/system/kernel/scheduler/scheduler.cpp
@@ -445,14 +445,14 @@ reschedule(int32 nextState)
 		nextThreadData
 			= cpu->ChooseNextThread(enqueueOldThread ? oldThreadData : NULL,
 				putOldThreadAtBack);
+
+		// update CPU heap
+		CoreCPUHeapLocker cpuLocker(core);
+		cpu->UpdatePriority(nextThreadData->GetEffectivePriority());
 	}
 
 	Thread* nextThread = nextThreadData->GetThread();
 	ASSERT(!gCPU[thisCPU].disabled || thread_is_idle_thread(nextThread));
-	// update CPU heap
-	CoreCPUHeapLocker cpuLocker(core);
-	cpu->UpdatePriority(nextThreadData->GetEffectivePriority());
-	cpuLocker.Unlock();
 
 	if (nextThread != oldThread) {
 		if (enqueueOldThread) {
diff --git a/src/system/kernel/scheduler/scheduler_cpu.cpp b/src/system/kernel/scheduler/scheduler_cpu.cpp
index 771f1d799d..9f9eb48cef 100644
--- a/src/system/kernel/scheduler/scheduler_cpu.cpp
+++ b/src/system/kernel/scheduler/scheduler_cpu.cpp
@@ -152,8 +152,7 @@ CPUEntry::UpdatePriority(int32 priority)
 {
 	SCHEDULER_ENTER_FUNCTION();
 
-	if (gCPU[fCPUNumber].disabled)
-		return;
+	ASSERT(!gCPU[fCPUNumber].disabled);
 
 	int32 oldPriority = CPUPriorityHeap::GetKey(this);
 	if (oldPriority == priority)
@@ -176,6 +175,7 @@ CPUEntry::ComputeLoad()
 	SCHEDULER_ENTER_FUNCTION();
 
 	ASSERT(gTrackLoad);
+	ASSERT(!gCPU[fCPUNumber].disabled);
 	ASSERT(fCPUNumber == smp_get_current_cpu());
 
 	int oldLoad = compute_load(fMeasureTime, fMeasureActiveTime, fLoad);