diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /arch/mips/kernel/semaphore.c | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'arch/mips/kernel/semaphore.c')
| -rw-r--r-- | arch/mips/kernel/semaphore.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/kernel/semaphore.c b/arch/mips/kernel/semaphore.c index 1f47bd929..5a9478f03 100644 --- a/arch/mips/kernel/semaphore.c +++ b/arch/mips/kernel/semaphore.c @@ -187,8 +187,7 @@ __down_write(struct rw_semaphore *sem, int count) add_wait_queue_exclusive(&sem->wait, &wait); while (atomic_read(&sem->count) < 0) { - set_task_state(tsk, (TASK_UNINTERRUPTIBLE - | TASK_EXCLUSIVE)); + set_task_state(tsk, TASK_UNINTERRUPTIBLE); if (atomic_read(&sem->count) >= RW_LOCK_BIAS) break; schedule(); @@ -208,8 +207,7 @@ __down_write(struct rw_semaphore *sem, int count) while (1) { if (test_and_clear_bit(1, &sem->granted)) break; - set_task_state(tsk, (TASK_UNINTERRUPTIBLE - | TASK_EXCLUSIVE)); + set_task_state(tsk, TASK_UNINTERRUPTIBLE); if ((sem->granted & 2) == 0) schedule(); } |