diff --git a/[refs] b/[refs] index 5eff70b4597d..1de7ea51e76b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5274f8354d6a1ed9d6688e6a89b705b94aa1b6e9 +refs/heads/master: a0a522ce3d6d8c907e45d4f2730ee8573484cc88 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 5faf5d482fcd..648154cf1117 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -555,7 +555,6 @@ struct rq { unsigned long nr_running; #define CPU_LOAD_IDX_MAX 5 unsigned long cpu_load[CPU_LOAD_IDX_MAX]; - unsigned char idle_at_tick; #ifdef CONFIG_NO_HZ unsigned long last_tick_seen; unsigned char in_nohz_recently; @@ -596,6 +595,7 @@ struct rq { struct root_domain *rd; struct sched_domain *sd; + unsigned char idle_at_tick; /* For active balancing */ int active_balance; int push_cpu;