From 76b7f2c40ffadef02a7eae672130356ee983691a Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Dec 2009 14:46:33 -0800
Subject: [PATCH] --- yaml --- r: 175861 b: refs/heads/master c:
 f01eb3640308c005d31b29d0a8bc2b7acb4e3f75 h: refs/heads/master i:   175859:
 c1d3cfd250dff7b2233a50349d4b3b6b5a884b54 v: v3

---
 [refs]                  | 2 +-
 trunk/lib/kernel_lock.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b87dd11f7494..aab15d35d937 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6698e34720660e18b45e2e3b115ee4584d0c3b5e
+refs/heads/master: f01eb3640308c005d31b29d0a8bc2b7acb4e3f75
diff --git a/trunk/lib/kernel_lock.c b/trunk/lib/kernel_lock.c
index 4ebfa5a164d7..5526b46aba94 100644
--- a/trunk/lib/kernel_lock.c
+++ b/trunk/lib/kernel_lock.c
@@ -122,8 +122,10 @@ void __lockfunc _lock_kernel(const char *func, const char *file, int line)
 
 	trace_lock_kernel(func, file, line);
 
-	if (likely(!depth))
+	if (likely(!depth)) {
+		might_sleep();
 		__lock_kernel();
+	}
 	current->lock_depth = depth;
 }