Commit d65b78f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull scheduler fix from Ingo Molnar:
 "A oneliner rq throttling fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Test list head instead of list entry in throttle_cfs_rq()
parents f79a17bf d49db342

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -3683,7 +3683,7 @@ static void throttle_cfs_rq(struct cfs_rq *cfs_rq) 
	cfs_rq->throttled = 1;

	cfs_rq->throttled_clock = rq_clock(rq);

	raw_spin_lock(&cfs_b->lock);

	empty = list_empty(&cfs_rq->throttled_list);

	empty = list_empty(&cfs_b->throttled_cfs_rq);



	/*

	 * Add to the _head_ of the list, so that an already-started