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; }