sched: remove the 'u64 now' parameter from inc_nr_running()

[linux-2.6] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index aa8cac4ae547cc0d70e4a5c68e028a0a205576a9..bdb683464c0002a088b8e3e779dc1a8831e0ada2 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -804,14 +804,13 @@ static inline void inc_load(struct rq *rq, const struct task_struct *p)
        update_load_add(&rq->ls.load, p->se.load.weight);
 }
 
-static inline void
-dec_load(struct rq *rq, const struct task_struct *p, u64 now)
+static inline void dec_load(struct rq *rq, const struct task_struct *p)
 {
        update_curr_load(rq);
        update_load_sub(&rq->ls.load, p->se.load.weight);
 }
 
-static void inc_nr_running(struct task_struct *p, struct rq *rq, u64 now)
+static void inc_nr_running(struct task_struct *p, struct rq *rq)
 {
        rq->nr_running++;
        inc_load(rq, p);
@@ -820,7 +819,7 @@ static void inc_nr_running(struct task_struct *p, struct rq *rq, u64 now)
 static void dec_nr_running(struct task_struct *p, struct rq *rq, u64 now)
 {
        rq->nr_running--;
-       dec_load(rq, p, now);
+       dec_load(rq, p);
 }
 
 static void set_load_weight(struct task_struct *p)
@@ -922,7 +921,7 @@ static void activate_task(struct rq *rq, struct task_struct *p, int wakeup)
                rq->nr_uninterruptible--;
 
        enqueue_task(rq, p, wakeup, now);
-       inc_nr_running(p, rq, now);
+       inc_nr_running(p, rq);
 }
 
 /*
@@ -939,7 +938,7 @@ static inline void activate_idle_task(struct task_struct *p, struct rq *rq)
                rq->nr_uninterruptible--;
 
        enqueue_task(rq, p, 0, now);
-       inc_nr_running(p, rq, now);
+       inc_nr_running(p, rq);
 }
 
 /*
@@ -1672,7 +1671,7 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
                 * management (if any):
                 */
                p->sched_class->task_new(rq, p);
-               inc_nr_running(p, rq, now);
+               inc_nr_running(p, rq);
        }
        check_preempt_curr(rq, p);
        task_rq_unlock(rq, &flags);
@@ -3981,7 +3980,7 @@ void set_user_nice(struct task_struct *p, long nice)
        on_rq = p->se.on_rq;
        if (on_rq) {
                dequeue_task(rq, p, 0, now);
-               dec_load(rq, p, now);
+               dec_load(rq, p);
        }
 
        p->static_prio = NICE_TO_PRIO(nice);