summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/semaphore.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kernel/semaphore.c')
-rw-r--r--arch/ia64/kernel/semaphore.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ia64/kernel/semaphore.c b/arch/ia64/kernel/semaphore.c
index 84ff34cf6..f26099912 100644
--- a/arch/ia64/kernel/semaphore.c
+++ b/arch/ia64/kernel/semaphore.c
@@ -50,7 +50,7 @@ __down (struct semaphore *sem)
{
struct task_struct *tsk = current;
DECLARE_WAITQUEUE(wait, tsk);
- tsk->state = TASK_UNINTERRUPTIBLE|TASK_EXCLUSIVE;
+ tsk->state = TASK_UNINTERRUPTIBLE;
add_wait_queue_exclusive(&sem->wait, &wait);
spin_lock_irq(&semaphore_lock);
@@ -70,7 +70,7 @@ __down (struct semaphore *sem)
spin_unlock_irq(&semaphore_lock);
schedule();
- tsk->state = TASK_UNINTERRUPTIBLE|TASK_EXCLUSIVE;
+ tsk->state = TASK_UNINTERRUPTIBLE;
spin_lock_irq(&semaphore_lock);
}
spin_unlock_irq(&semaphore_lock);
@@ -85,7 +85,7 @@ __down_interruptible (struct semaphore * sem)
int retval = 0;
struct task_struct *tsk = current;
DECLARE_WAITQUEUE(wait, tsk);
- tsk->state = TASK_INTERRUPTIBLE|TASK_EXCLUSIVE;
+ tsk->state = TASK_INTERRUPTIBLE;
add_wait_queue_exclusive(&sem->wait, &wait);
spin_lock_irq(&semaphore_lock);
@@ -121,7 +121,7 @@ __down_interruptible (struct semaphore * sem)
spin_unlock_irq(&semaphore_lock);
schedule();
- tsk->state = TASK_INTERRUPTIBLE|TASK_EXCLUSIVE;
+ tsk->state = TASK_INTERRUPTIBLE;
spin_lock_irq(&semaphore_lock);
}
spin_unlock_irq(&semaphore_lock);
@@ -248,7 +248,7 @@ down_write_failed_biased (struct rw_semaphore *sem)
for (;;) {
if (sem->write_bias_granted && xchg(&sem->write_bias_granted, 0))
break;
- set_task_state(tsk, TASK_UNINTERRUPTIBLE | TASK_EXCLUSIVE);
+ set_task_state(tsk, TASK_UNINTERRUPTIBLE);
if (!sem->write_bias_granted)
schedule();
}
@@ -277,7 +277,7 @@ down_write_failed (struct rw_semaphore *sem)
add_wait_queue_exclusive(&sem->wait, &wait);
while (sem->count < 0) {
- set_task_state(tsk, TASK_UNINTERRUPTIBLE | TASK_EXCLUSIVE);
+ set_task_state(tsk, TASK_UNINTERRUPTIBLE);
if (sem->count >= 0)
break; /* we must attempt to acquire or bias the lock */
schedule();