From 6a6e554ab1acd34e8ca959c57457545c0588907e Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 7 Feb 2006 22:45:32 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=9415
---
 checkin_notes         | 1 +
 client/cs_scheduler.C | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 919b25ba5b..5c8d34fc1b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -1596,3 +1596,4 @@ David  7 Feb 2006
         client_state.h
         client_types.h
         cs_apps.C
+        cs_scheduler.C
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 5c702cb5c6..f703314d3d 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -1051,14 +1051,12 @@ bool CLIENT_STATE::should_get_work() {
         return true;
     }
 
-#ifndef NEW_CPU_SCHED
     // if the CPU started this time period overloaded,
     // let it process for a while to get out of the CPU overload state.
     //
     if (!work_fetch_no_new_work) {
         set_scheduler_modes();
     }
-#endif
 
     return !work_fetch_no_new_work;
 }
@@ -1228,8 +1226,6 @@ bool CLIENT_STATE::rr_misses_deadline(double per_cpu_proc_rate, double rrs) {
     return false;
 }
 
-#ifndef NEW_CPU_SCHED
-
 // Decide on modes for work-fetch and CPU sched policies.
 // Namely, set the variables
 // - work_fetch_no_new_work
@@ -1325,7 +1321,6 @@ void CLIENT_STATE::set_scheduler_modes() {
     work_fetch_no_new_work = should_not_fetch_work;
     cpu_earliest_deadline_first = use_earliest_deadline_first;
 }
-#endif
 
 double CLIENT_STATE::work_needed_secs() {
     double total_work = 0;