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
mm: add comments to explain mm_struct fields
[pandora-kernel.git]
/
kernel
/
rtmutex.c
diff --git
a/kernel/rtmutex.c
b/kernel/rtmutex.c
index
255e166
..
5e8d9cc
100644
(file)
--- a/
kernel/rtmutex.c
+++ b/
kernel/rtmutex.c
@@
-579,6
+579,7
@@
__rt_mutex_slowlock(struct rt_mutex *lock, int state,
struct rt_mutex_waiter *waiter)
{
int ret = 0;
struct rt_mutex_waiter *waiter)
{
int ret = 0;
+ int was_disabled;
for (;;) {
/* Try to acquire the lock: */
for (;;) {
/* Try to acquire the lock: */
@@
-601,10
+602,17
@@
__rt_mutex_slowlock(struct rt_mutex *lock, int state,
raw_spin_unlock(&lock->wait_lock);
raw_spin_unlock(&lock->wait_lock);
+ was_disabled = irqs_disabled();
+ if (was_disabled)
+ local_irq_enable();
+
debug_rt_mutex_print_deadlock(waiter);
schedule_rt_mutex(lock);
debug_rt_mutex_print_deadlock(waiter);
schedule_rt_mutex(lock);
+ if (was_disabled)
+ local_irq_disable();
+
raw_spin_lock(&lock->wait_lock);
set_current_state(state);
}
raw_spin_lock(&lock->wait_lock);
set_current_state(state);
}