adaptive: get rid of weight-estimator slope misconception

This concept is redundant with the per-service-level weights. Also fix
the get_sl() macro.

1 files changed, 1 insertions, 31 deletions

diff --git a/kernel/litmus.c b/kernel/litmus.c
index e837850998..81132dc848 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -181,8 +181,7 @@ asmlinkage long sys_get_rt_task_param(pid_t pid, rt_param_t __user * param)
  */
 asmlinkage long sys_set_service_levels(pid_t pid, 
                                        unsigned int count,
-                                       service_level_t __user *levels,
-                                       fp_t __user *wt_y, fp_t __user *wt_slope)
+                                       service_level_t __user *levels)
 {
         struct task_struct *target;
         service_level_t level, *klevels;
@@ -218,35 +217,6 @@ asmlinkage long sys_set_service_levels(pid_t pid,
         target->rt_param.service_level     = NULL;
         target->rt_param.no_service_levels = 0; 
 
-        if (wt_y && wt_slope) {
-                if (copy_from_user(&target->rt_param.wt_y, wt_y, 
-                                   sizeof(fp_t))) {
-                        retval = -EFAULT;
-                        target->rt_param.wt_y     = FP(0);
-                        goto out;
-                }
-                if (copy_from_user(&target->rt_param.wt_slope, wt_slope, 
-                                   sizeof(fp_t))) {
-                        retval = -EFAULT;
-                        target->rt_param.wt_y     = FP(0);
-                        target->rt_param.wt_slope = FP(1);
-                        goto out;
-                }
-                if (_lt(target->rt_param.wt_y, FP(0)) ||
-                    _leq(target->rt_param.wt_slope, FP(0))) {
-                        retval = -EINVAL;
-                        target->rt_param.wt_y     = FP(0);
-                        target->rt_param.wt_slope = FP(1);
-                        goto out;
-                }
-        } else {
-                target->rt_param.wt_y     = FP(0);
-                target->rt_param.wt_slope = FP(1);
-        }
-
-        TRACE_TASK(target, "set slope=" _FP_ ", y=" _FP_ "\n", 
-                   target->rt_param.wt_slope, target->rt_param.wt_y);
-
         /* count == 0 means tear down service levels*/
         if (count == 0) {
                 retval = 0;