From 74173043f3dce8b627d08efbfba77e26946e5561 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 16 Jul 2009 15:44:29 +0200
Subject: [PATCH] --- yaml --- r: 158324 b: refs/heads/master c:
 e09758fae8ccde97e026c704319eaa18d488dc86 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 1 +
 trunk/kernel/sched.c         | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 276d6cb5f275..0c9be3111c5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b2155678d7cc7b5f45d6b36049091376c3408a2
+refs/heads/master: e09758fae8ccde97e026c704319eaa18d488dc86
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index d6320a3e8def..b804f694ae6a 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -139,6 +139,7 @@ extern int _cond_resched(void);
 # define might_sleep() \
 	do { __might_sleep(__FILE__, __LINE__); might_resched(); } while (0)
 #else
+  static inline void __might_sleep(char *file, int line) { }
 # define might_sleep() do { might_resched(); } while (0)
 #endif
 
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 4d39e96044b9..370a6c31c5e1 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -6610,9 +6610,8 @@ static inline int should_resched(void)
 
 static void __cond_resched(void)
 {
-#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
 	__might_sleep(__FILE__, __LINE__);
-#endif
+
 	add_preempt_count(PREEMPT_ACTIVE);
 	schedule();
 	sub_preempt_count(PREEMPT_ACTIVE);