X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Frtmutex.c;h=a242e691c993038f35ace870d245487d44b5bc16;hb=283dbd82055eb70ff3b469f812d9c695f18c9641;hp=f9d8482dd4872f631b8bfb3524f5797b2eb711f4;hpb=27263e28321db438bc43dc0c0be432ce91526224;p=~andy%2Flinux diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index f9d8482dd48..a242e691c99 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -579,7 +579,6 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state, struct rt_mutex_waiter *waiter) { int ret = 0; - int was_disabled; for (;;) { /* Try to acquire the lock: */ @@ -602,17 +601,10 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state, 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); - if (was_disabled) - local_irq_disable(); - raw_spin_lock(&lock->wait_lock); set_current_state(state); }