diff --git a/[refs] b/[refs] index 3fdd1c48887c..2f1726c632c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30fd049afcfed50e022704036e8629d6bdfe84e6 +refs/heads/master: ed387b781ea6e14b78f449aa2ee4f270b60b01ac diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c index 8e77a6bd597b..4ab60a24ea49 100644 --- a/trunk/kernel/sched/fair.c +++ b/trunk/kernel/sched/fair.c @@ -215,8 +215,6 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, const struct sched_class fair_sched_class; -static unsigned long __read_mostly max_load_balance_interval = HZ/10; - /************************************************************** * CFS operations on generic schedulable entities: */ @@ -3086,6 +3084,8 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preemp * Fair scheduling class load-balancing methods: */ +static unsigned long __read_mostly max_load_balance_interval = HZ/10; + /* * pull_task - move a task from a remote runqueue to the local runqueue. * Both runqueues must be locked.