diff --git a/[refs] b/[refs] index 675974692665..f72267491702 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbdba7c0e1161934ae881ad00e4db49830f5ef59 +refs/heads/master: db36cc7d6d9e538481e60fae7f56646b92557526 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 2df5a6467812..e3081fb65d63 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -460,8 +460,8 @@ static void dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep) { update_stats_dequeue(cfs_rq, se); - if (sleep) { #ifdef CONFIG_SCHEDSTATS + if (sleep) { if (entity_is_task(se)) { struct task_struct *tsk = task_of(se); @@ -470,8 +470,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep) if (tsk->state & TASK_UNINTERRUPTIBLE) se->block_start = rq_of(cfs_rq)->clock; } -#endif } +#endif __dequeue_entity(cfs_rq, se); }