diff --git a/[refs] b/[refs]
index c734ae60695f..08737ab37d22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fea80e4d984d411aa188baa31225c273ebe0fe6
+refs/heads/master: 66e5393a78b3fcca63e7748e38221dcca61c4aab
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 19c0d5d16fef..15abf0833245 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -3862,6 +3862,8 @@ int sched_setscheduler(struct task_struct *p, int policy,
 	unsigned long flags;
 	runqueue_t *rq;
 
+	/* may grab non-irq protected spin_locks */
+	BUG_ON(in_interrupt());
 recheck:
 	/* double check policy once rq lock held */
 	if (policy < 0)