diff --git a/[refs] b/[refs] index 0cfc0f2f0d5a..d9a638fede13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4ec24b48ddef1e93f7578be53270f0b95ad666c +refs/heads/master: a03c9061d93822f66eb6287f8e9cf5833a12b49c diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 48604eab7dad..d8502ec569e4 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -342,17 +342,6 @@ update_stats_wait_start(struct cfs_rq *cfs_rq, struct sched_entity *se) schedstat_set(se->wait_start, rq_of(cfs_rq)->clock); } -static inline unsigned long -calc_weighted(unsigned long delta, struct sched_entity *se) -{ - unsigned long weight = se->load.weight; - - if (unlikely(weight != NICE_0_LOAD)) - return (u64)delta * se->load.weight >> NICE_0_SHIFT; - else - return delta; -} - /* * Task is being enqueued - update stats: */