Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e053738 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: refactor wait_for_completion_timeout()
  sched: fix wait_for_completion_timeout() spurious failure under heavy load
  sched: rt: dont stop the period timer when there are tasks wanting to run
parents ee5c2ab0 198bb971

kernel/sched.c

+6 −8
Original line number Diff line number Diff line
@@ -4398,22 +4398,20 @@ do_wait_for_common(struct completion *x, long timeout, int state) 
			     signal_pending(current)) ||

			    (state == TASK_KILLABLE &&

			     fatal_signal_pending(current))) {

				__remove_wait_queue(&x->wait, &wait);

				return -ERESTARTSYS;

				timeout = -ERESTARTSYS;

				break;

			}

			__set_current_state(state);

			spin_unlock_irq(&x->wait.lock);

			timeout = schedule_timeout(timeout);

			spin_lock_irq(&x->wait.lock);

			if (!timeout) {

		} while (!x->done && timeout);

		__remove_wait_queue(&x->wait, &wait);

		if (!x->done)

			return timeout;

	}

		} while (!x->done);

		__remove_wait_queue(&x->wait, &wait);

	}

	x->done--;

	return timeout;

	return timeout ?: 1;

}



static long __sched

kernel/sched_rt.c

+2 −1
Original line number Diff line number Diff line
@@ -250,7 +250,8 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) 
			if (rt_rq->rt_time || rt_rq->rt_nr_running)

				idle = 0;

			spin_unlock(&rt_rq->rt_runtime_lock);

		}

		} else if (rt_rq->rt_nr_running)

			idle = 0;



		if (enqueue)

			sched_rt_rq_enqueue(rt_rq);