X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fvserver%2Fsched.c;h=d3e58bee2a6d04c746c7da61c34944e16d13b471;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=60f3c6ac538fda6ffabc6c19a7ad601a22a31a30;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git

diff --git a/kernel/vserver/sched.c b/kernel/vserver/sched.c
index 60f3c6ac5..d3e58bee2 100644
--- a/kernel/vserver/sched.c
+++ b/kernel/vserver/sched.c
@@ -10,7 +10,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/vs_context.h>
 #include <linux/vs_sched.h>
@@ -118,7 +117,7 @@ int vx_effective_vavavoom(struct vx_info *vxi, int max_prio)
 		vavavoom = 0;
 
 	vxi->sched.vavavoom = vavavoom;
-	return vavavoom;
+	return vavavoom + vxi->sched.priority_bias;
 }
 
 
@@ -130,7 +129,7 @@ int vc_set_sched_v2(uint32_t xid, void __user *data)
 	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
-	vxi = locate_vx_info(xid);
+	vxi = lookup_vx_info(xid);
 	if (!vxi)
 		return -EINVAL;
 
@@ -174,7 +173,7 @@ int vc_set_sched(uint32_t xid, void __user *data)
 	if (copy_from_user (&vc_data, data, sizeof(vc_data)))
 		return -EFAULT;
 
-	vxi = locate_vx_info(xid);
+	vxi = lookup_vx_info(xid);
 	if (!vxi)
 		return -EINVAL;