diff --git a/[refs] b/[refs] index c8b5e4f17daf..099011d70d67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e72ff0bb2c163eb13014ba113701bd42dab382fe +refs/heads/master: 5138930e6a69f1c7851a82d7cedaa01fad029fcf diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 7b371931114f..3055fe806ff7 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -705,8 +705,7 @@ static int recalc_task_prio(task_t *p, unsigned long long now) * active yet prevent them suddenly becoming cpu hogs and * starving other processes. */ - if (p->mm && p->sleep_type != SLEEP_NONINTERACTIVE && - sleep_time > INTERACTIVE_SLEEP(p)) { + if (p->mm && sleep_time > INTERACTIVE_SLEEP(p)) { unsigned long ceiling; ceiling = JIFFIES_TO_NS(MAX_SLEEP_AVG -