Patch to ymfpci (set_current_state repositioning)

From: Pete Zaitcev (zaitcev@redhat.com)
Date: Mon Sep 17 2001 - 20:59:01 EST


Dear Linus,

please consider the patch below for 2.4.10. Suggested by Arjan van
de Ven and confirmed with Alan, DaveM (I hope that I understood right
what they explained to me).

Yours,
-- Pete

--- linux-2.4.9/drivers/sound/ymfpci.c Sun Aug 12 10:51:42 2001
+++ linux-2.4.9-niph/drivers/sound/ymfpci.c Mon Sep 17 18:35:09 2001
@@ -457,11 +457,12 @@
         }
 #endif
 
+ set_current_state(TASK_UNINTERRUPTIBLE);
         while (ypcm->running) {
                 spin_unlock_irqrestore(&unit->reg_lock, flags);
- set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule();
                 spin_lock_irqsave(&unit->reg_lock, flags);
+ set_current_state(TASK_UNINTERRUPTIBLE);
         }
         spin_unlock_irqrestore(&unit->reg_lock, flags);
 
@@ -1198,12 +1199,13 @@
         ret = 0;
 
         add_wait_queue(&dmabuf->wait, &waita);
+ set_current_state(TASK_INTERRUPTIBLE);
         while (count > 0) {
                 spin_lock_irqsave(&unit->reg_lock, flags);
                 if (unit->suspended) {
                         spin_unlock_irqrestore(&unit->reg_lock, flags);
- set_current_state(TASK_INTERRUPTIBLE);
                         schedule();
+ set_current_state(TASK_INTERRUPTIBLE);
                         if (signal_pending(current)) {
                                 if (!ret) ret = -EAGAIN;
                                 break;
@@ -1241,9 +1243,9 @@
                            is TOO LATE for the process to be scheduled to run (scheduler latency)
                            which results in a (potential) buffer overrun. And worse, there is
                            NOTHING we can do to prevent it. */
- set_current_state(TASK_INTERRUPTIBLE);
                         tmo = schedule_timeout(tmo);
                         spin_lock_irqsave(&state->unit->reg_lock, flags);
+ set_current_state(TASK_INTERRUPTIBLE);
                         if (tmo == 0 && dmabuf->count == 0) {
                                 printk(KERN_ERR "ymfpci%d: recording schedule timeout, "
                                     "dmasz %u fragsz %u count %i hwptr %u swptr %u\n",
@@ -1326,12 +1328,13 @@
         redzone *= 3; /* 2 redzone + 1 possible uncertainty reserve. */
 
         add_wait_queue(&dmabuf->wait, &waita);
+ set_current_state(TASK_INTERRUPTIBLE);
         while (count > 0) {
                 spin_lock_irqsave(&unit->reg_lock, flags);
                 if (unit->suspended) {
                         spin_unlock_irqrestore(&unit->reg_lock, flags);
- set_current_state(TASK_INTERRUPTIBLE);
                         schedule();
+ set_current_state(TASK_INTERRUPTIBLE);
                         if (signal_pending(current)) {
                                 if (!ret) ret = -EAGAIN;
                                 break;
@@ -1389,8 +1392,8 @@
                                 if (!ret) ret = -EAGAIN;
                                 break;
                         }
- set_current_state(TASK_INTERRUPTIBLE);
                         schedule();
+ set_current_state(TASK_INTERRUPTIBLE);
                         if (signal_pending(current)) {
                                 if (!ret) ret = -ERESTARTSYS;
                                 break;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Sep 23 2001 - 21:00:23 EST