git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
lib
/
kernel_lock.c
diff --git
a/lib/kernel_lock.c
b/lib/kernel_lock.c
index
bd2bc5d
..
cb5490e
100644
(file)
--- a/
lib/kernel_lock.c
+++ b/
lib/kernel_lock.c
@@
-177,8
+177,7
@@
static inline void __lock_kernel(void)
static inline void __unlock_kernel(void)
{
- _raw_spin_unlock(&kernel_flag);
- preempt_enable();
+ spin_unlock(&kernel_flag);
}
/*