Commit 8ba7b0a1 authored Mar 06, 2006 by Linus Torvalds

Add early-boot-safety check to cond_resched()



Just to be safe, we should not trigger a conditional reschedule during
the early boot sequence.  We've historically done some questionable
early on, and the safety warnings in __might_sleep() are generally
turned off during that period, so there might be problems lurking.

This affects CONFIG_PREEMPT_VOLUNTARY, which takes over might_sleep() to
cause a voluntary conditional reschedule.

Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 91c0bce2

kernel/sched.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4028,6 +4028,8 @@ static inline void __cond_resched(void)
	*/		*/
	if (unlikely(preempt_count()))		if (unlikely(preempt_count()))
	return;		return;
			if (unlikely(system_state != SYSTEM_RUNNING))
			return;
	do {		do {
	add_preempt_count(PREEMPT_ACTIVE);		add_preempt_count(PREEMPT_ACTIVE);
	schedule();		schedule();