diff --git a/[refs] b/[refs] index 7ebdacb757f9..ba0d00857e8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7ab0f7b50bc4688fb5cf65de5d42e3b882fb8d1 +refs/heads/master: e17b38bf9e70d74f3739a600db75240078ac1407 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index e3f8f4f61c8e..789001da0a94 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -676,6 +676,7 @@ inline void update_rq_clock(struct rq *rq) /** * runqueue_is_locked + * @cpu: the processor in question. * * Returns true if the current cpu runqueue is locked. * This interface allows printk to be called with the runqueue lock @@ -3660,6 +3661,7 @@ static void update_group_power(struct sched_domain *sd, int cpu) /** * update_sg_lb_stats - Update sched_group's statistics for load balancing. + * @sd: The sched_domain whose statistics are to be updated. * @group: sched_group whose statistics are to be updated. * @this_cpu: Cpu for which load balance is currently performed. * @idle: Idle status of this_cpu