git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1e496fd
)
Fixed a typo
author
Andy Bavier
<acb@cs.princeton.edu>
Mon, 31 Mar 2008 22:24:13 +0000
(22:24 +0000)
committer
Andy Bavier
<acb@cs.princeton.edu>
Mon, 31 Mar 2008 22:24:13 +0000
(22:24 +0000)
linux-2.6-210-vserver-cpu-sched.patch
patch
|
blob
|
history
diff --git
a/linux-2.6-210-vserver-cpu-sched.patch
b/linux-2.6-210-vserver-cpu-sched.patch
index
154d6ea
..
3ecfd30
100644
(file)
--- 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
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 1
7: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 1
8: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
@@ -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])
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];
- 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
+ if (tokens % sched_pc->fill_rate[1])
+ delta_min[1] += sched_pc->interval[1];
+ } else