From: Andy Bavier <acb@cs.princeton.edu>
Date: Mon, 31 Mar 2008 22:24:13 +0000 (+0000)
Subject: Fixed a typo
X-Git-Tag: linux-2.6-22-2~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=2526aa0d800279b342e5c3d77b7c935e9c0bf846;p=linux-2.6.git

Fixed a typo
---

diff --git a/linux-2.6-210-vserver-cpu-sched.patch b/linux-2.6-210-vserver-cpu-sched.patch
index 154d6eaf2..3ecfd3010 100644
--- a/linux-2.6-210-vserver-cpu-sched.patch
+++ b/linux-2.6-210-vserver-cpu-sched.patch
@@ -1,6 +1,6 @@
 diff -Nurp linux-2.6.22-200/kernel/vserver/sched.c linux-2.6.22-210/kernel/vserver/sched.c
---- linux-2.6.22-200/kernel/vserver/sched.c	2008-03-20 17:15:35.000000000 -0400
-+++ linux-2.6.22-210/kernel/vserver/sched.c	2008-03-31 17:55:55.000000000 -0400
+--- linux-2.6.22-200/kernel/vserver/sched.c	2008-03-31 17:57:47.000000000 -0400
++++ linux-2.6.22-210/kernel/vserver/sched.c	2008-03-31 18:22:46.000000000 -0400
 @@ -91,7 +91,7 @@ int vx_tokens_recalc(struct _vx_sched_pc
  		vxd_check_range(delta_min[0], 0, sched_pc->interval[0]);
  #endif
@@ -32,11 +32,12 @@ diff -Nurp linux-2.6.22-200/kernel/vserver/sched.c linux-2.6.22-210/kernel/vserv
  	if (!sched_pc->fill_rate[1])
  		delta_min[1] = HZ;
 -	else if (tokens > sched_pc->fill_rate[1])
-+	else if (tokens > sched_pc->fill_rate[1]) {
- 		delta_min[1] += sched_pc->interval[1] *
+-		delta_min[1] += sched_pc->interval[1] *
 -			tokens / sched_pc->fill_rate[1];
 -	else
-+			tokens / sched_pc->fill_rate[1] - delta_min[1];
++	else if (tokens > sched_pc->fill_rate[1]) {
++		delta_min[1] = sched_pc->interval[1] *
++		        (tokens / sched_pc->fill_rate[1]) - delta_min[1];
 +		if (tokens % sched_pc->fill_rate[1]) 
 +			delta_min[1] += sched_pc->interval[1];
 +	} else