diff --git a/[refs] b/[refs] index 298cb3f21acf..2511c4c459fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 970e178985cadbca660feb02f4d2ee3a09f7fdda +refs/heads/master: 85c1e7dae165acd004429f81fe52bfbf55b57a98 diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c index dd00aaf44fda..9361669d4242 100644 --- a/trunk/kernel/sched/fair.c +++ b/trunk/kernel/sched/fair.c @@ -3058,8 +3058,8 @@ static unsigned long __read_mostly max_load_balance_interval = HZ/10; struct lb_env { struct sched_domain *sd; - int src_cpu; struct rq *src_rq; + int src_cpu; int dst_cpu; struct rq *dst_rq;