diff --git a/[refs] b/[refs]
index ed3df1c5c95a..6ba421b8c126 100644
--- 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
index 081ece26803f..8ffe523dfa8e 100644
--- 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());