---

yaml --- r: 277412 b: refs/heads/master c: 664dfa6 h: refs/heads/master v: v3
git-mirror · Dec 23, 2011 · a08f384 · a08f384
1 parent 6570b11
commit a08f384
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62af3783e4fd8ba9e28416e8e91cb3bdd9fb133e
+refs/heads/master: 664dfa65e84429d0b68694483e1de7365c7c56fb
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
@@ -3077,6 +3077,9 @@ static noinline void __schedule_bug(struct task_struct *prev)
 {
 	struct pt_regs *regs = get_irq_regs();
 
+	if (oops_in_progress)
+		return;
+
 	printk(KERN_ERR "BUG: scheduling while atomic: %s/%d/0x%08x\n",
 		prev->comm, prev->pid, preempt_count());