From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 25 Mar 2005 17:21:44 +0000 (+0000)
Subject: clean up
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~231
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fad2dff9fb40bfc1bb4976f8437c962f3f2c7fc3;p=linux-2.6.git

clean up
---

diff --git a/kernel/sched.c b/kernel/sched.c
index 855a39a81..10548388c 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -270,11 +270,6 @@ struct runqueue {
 	int idle_tokens;
 #endif
 
-#ifdef CONFIG_VSERVER_HARDCPU
-	struct list_head hold_queue;
-	int idle_tokens;
-#endif
-
 #ifdef CONFIG_SCHEDSTATS
 	/* latency stats */
 	struct sched_info rq_sched_info;
@@ -3341,26 +3336,6 @@ go_idle:
 	 */
 	next = rq_get_next_task(rq);
 
-#ifdef	CONFIG_VSERVER_HARDCPU
-	vxi = next->vx_info;
-	if (vx_info_flags(vxi, VXF_SCHED_PAUSE|VXF_SCHED_HARD, 0)) {
-		int ret = vx_tokens_recalc(vxi);
-
-		if (unlikely(ret <= 0)) {
-			if (ret && (rq->idle_tokens > -ret))
-				rq->idle_tokens = -ret;
-			__deactivate_task(next, rq);
-			recalc_task_prio(next, now);
-			// a new one on hold
-			vx_onhold_inc(vxi);
-			next->state |= TASK_ONHOLD;
-			list_add_tail(&next->run_list, &rq->hold_queue);
-			//printk("··· %8lu hold   %p [%d]\n", jiffies, next, next->prio);
-			goto pick_next;
-		}
-	}
-#endif
-
 #ifdef	CONFIG_VSERVER_HARDCPU
 	vxi = next->vx_info;
 	if (vx_info_flags(vxi, VXF_SCHED_PAUSE|VXF_SCHED_HARD, 0)) {