diff --git a/[refs] b/[refs] index 50a543aaa203..622055e46883 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b257c14ceb1194a6181144210056d38f22127189 +refs/heads/master: 09a40af5240de02d848247ab82440ad75b31ab11 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index ab562ae4007c..de0da71daf77 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1872,12 +1872,6 @@ static void set_load_weight(struct task_struct *p) p->se.load.inv_weight = prio_to_wmult[p->static_prio - MAX_RT_PRIO]; } -static void update_avg(u64 *avg, u64 sample) -{ - s64 diff = sample - *avg; - *avg += diff >> 3; -} - static void enqueue_task(struct rq *rq, struct task_struct *p, int flags) { update_rq_clock(rq); @@ -2332,6 +2326,12 @@ int select_task_rq(struct rq *rq, struct task_struct *p, int sd_flags, int wake_ return cpu; } + +static void update_avg(u64 *avg, u64 sample) +{ + s64 diff = sample - *avg; + *avg += diff >> 3; +} #endif /***