Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / kernel / vserver / sched.c

diff --git a/kernel/vserver/sched.c b/kernel/vserver/sched.c
index 60f3c6a..d3e58be 100644 (file)
--- 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;