patch-2.4.0-test11 linux/arch/i386/kernel/semaphore.c

• Lines: 54
• Date: Sat Nov 18 17:31:25 2000
• Orig file: v2.4.0-test10/linux/arch/i386/kernel/semaphore.c
• Orig date: Tue Oct 31 12:42:26 2000

diff -u --recursive --new-file v2.4.0-test10/linux/arch/i386/kernel/semaphore.c linux/arch/i386/kernel/semaphore.c
@@ -59,7 +59,7 @@
 {
 	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);
@@ -79,7 +79,7 @@
 		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);
@@ -93,7 +93,7 @@
 	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);
@@ -129,7 +129,7 @@
 		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);
@@ -315,7 +315,7 @@
 	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();
 	}
@@ -371,7 +371,7 @@
 	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) >= 0)
 			break;	/* we must attempt to acquire or bias the lock */
 		schedule();