From: Andy Bavier <acb@cs.princeton.edu>
Date: Wed, 27 Oct 2004 21:09:03 +0000 (+0000)
Subject: Commented out the 'interactive bonus' and 'cvt saving' when updating cvt
X-Git-Tag: before-enable-kexec-patch~26
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=139b9bdeafd762604024823b42d97ed0b6deabb0;p=linux-2.6.git

Commented out the 'interactive bonus' and 'cvt saving' when updating cvt
---

diff --git a/kernel/ckrm_sched.c b/kernel/ckrm_sched.c
index 1ca2611dc..5142b2eaa 100644
--- a/kernel/ckrm_sched.c
+++ b/kernel/ckrm_sched.c
@@ -37,12 +37,18 @@ static inline void check_inactive_class(ckrm_lrq_t * lrq,CVT_t cur_cvt)
 	if (unlikely(! cur_cvt))
 		return; 
 
+#ifndef INTERACTIVE_BONUS_SUPPORT
+#warning "ACB taking out interactive bonus calculation"	
+	bonus = 0;
+#else
 	/*
 	 * Always leaving a small bonus for inactive classes 
 	 * allows them to compete for cycles immediately when the become
 	 * active. This should improve interactive behavior
 	 */
 	bonus = INTERACTIVE_BONUS(lrq);
+#endif
+
 	//cvt can't be negative
 	if (cur_cvt > bonus)
 		min_cvt = cur_cvt - bonus;
@@ -77,7 +83,11 @@ static inline void check_inactive_class(ckrm_lrq_t * lrq,CVT_t cur_cvt)
 		lrq->savings -= savings_used;
 		unscale_cvt(savings_used,lrq);
 		BUG_ON(lrq->local_cvt < savings_used);
+#ifndef CVT_SAVINGS_SUPPORT
+#warning "ACB taking out cvt saving"
+#else
 		lrq->local_cvt -= savings_used;
+#endif
 	}		
 }