git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
string: on strstrip(), first remove leading spaces before running over str
[safe/jmp/linux-2.6]
/
lib
/
kernel_lock.c
diff --git
a/lib/kernel_lock.c
b/lib/kernel_lock.c
index
4ebfa5a
..
5526b46
100644
(file)
--- a/
lib/kernel_lock.c
+++ b/
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;
}