From cd6e9cbd58b5d9f33d6eb4495dc5ceea818dd061 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 23 Jun 2006 02:05:23 -0700
Subject: [PATCH] --- yaml --- r: 29044 b: refs/heads/master c:
 8e0a43d8fa953179505869ec28de78550246e795 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 41c337f71c51..7bcb4e738da5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e6672604773b9bae44d88d38afdf0763c104b1c
+refs/heads/master: 8e0a43d8fa953179505869ec28de78550246e795
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 87665132cec1..5dbc42694477 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -4053,6 +4053,9 @@ asmlinkage long sys_sched_yield(void)
 
 static inline void __cond_resched(void)
 {
+#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+	__might_sleep(__FILE__, __LINE__);
+#endif
 	/*
 	 * The BKS might be reacquired before we have dropped
 	 * PREEMPT_ACTIVE, which could trigger a second