diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/block/paride/pcd.c linux-ac/drivers/block/paride/pcd.c --- linux-2.4.15pre6/drivers/block/paride/pcd.c Sat Oct 27 09:03:47 2001 +++ linux-ac/drivers/block/paride/pcd.c Mon Nov 19 14:09:20 2001 @@ -588,7 +578,7 @@ static void pcd_sleep( int cs ) -{ current->state = TASK_INTERRUPTIBLE; +{ set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(cs); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/block/paride/pf.c linux-ac/drivers/block/paride/pf.c --- linux-2.4.15pre6/drivers/block/paride/pf.c Thu Oct 25 20:58:35 2001 +++ linux-ac/drivers/block/paride/pf.c Mon Nov 19 14:09:20 2001 @@ -676,7 +683,7 @@ static void pf_sleep( int cs ) -{ current->state = TASK_INTERRUPTIBLE; +{ set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(cs); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/block/paride/pg.c linux-ac/drivers/block/paride/pg.c --- linux-2.4.15pre6/drivers/block/paride/pg.c Thu Oct 11 16:04:57 2001 +++ linux-ac/drivers/block/paride/pg.c Mon Nov 19 14:09:20 2001 @@ -356,7 +356,7 @@ static void pg_sleep( int cs ) -{ current->state = TASK_INTERRUPTIBLE; +{ set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(cs); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/block/paride/pt.c linux-ac/drivers/block/paride/pt.c --- linux-2.4.15pre6/drivers/block/paride/pt.c Thu Oct 11 16:04:57 2001 +++ linux-ac/drivers/block/paride/pt.c Mon Nov 19 14:09:20 2001 @@ -468,7 +468,7 @@ static void pt_sleep( int cs ) -{ current->state = TASK_INTERRUPTIBLE; +{ set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(cs); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/cdrom/cdu31a.c linux-ac/drivers/cdrom/cdu31a.c --- linux-2.4.15pre6/drivers/cdrom/cdu31a.c Thu Oct 25 20:58:35 2001 +++ linux-ac/drivers/cdrom/cdu31a.c Mon Nov 19 14:09:20 2001 @@ -394,7 +394,7 @@ unsigned long flags; if (cdu31a_irq <= 0) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(0); } else { /* Interrupt driven */ @@ -737,7 +737,7 @@ res_reg[1]); } - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(2 * HZ); sony_get_toc(); @@ -968,7 +968,7 @@ if (((result_buffer[0] & 0xf0) == 0x20) && (num_retries < MAX_CDU31A_RETRIES)) { num_retries++; - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ / 10); /* Wait .1 seconds on retries */ goto retry_cd_operation; } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/cdrom/mcd.c linux-ac/drivers/cdrom/mcd.c --- linux-2.4.15pre6/drivers/cdrom/mcd.c Thu Oct 25 20:58:35 2001 +++ linux-ac/drivers/cdrom/mcd.c Mon Nov 19 14:09:20 2001 @@ -996,7 +989,7 @@ if (st == -1) goto err_out; /* drive doesn't respond */ if ((st & MST_READY) == 0) { /* no disk? wait a sec... */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ); } } while (((st & MST_READY) == 0) && count++ < MCD_RETRY_ATTEMPTS); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/cdrom/sbpcd.c linux-ac/drivers/cdrom/sbpcd.c --- linux-2.4.15pre6/drivers/cdrom/sbpcd.c Thu Oct 25 20:58:35 2001 +++ linux-ac/drivers/cdrom/sbpcd.c Mon Nov 19 14:09:20 2001 @@ -878,7 +878,7 @@ static void sbp_sleep(u_int time) { sti(); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(time); sti(); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/cdrom/sonycd535.c linux-ac/drivers/cdrom/sonycd535.c --- linux-2.4.15pre6/drivers/cdrom/sonycd535.c Thu Oct 25 20:58:35 2001 +++ linux-ac/drivers/cdrom/sonycd535.c Mon Nov 19 14:09:20 2001 @@ -339,7 +339,7 @@ sony_sleep(void) { if (sony535_irq_used <= 0) { /* poll */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(0); } else { /* Interrupt driven */ cli(); @@ -894,7 +894,7 @@ } if (readStatus == BAD_STATUS) { /* Sleep for a while, then retry */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(RETRY_FOR_BAD_STATUS*HZ/10); } #if DEBUG > 0 @@ -1515,7 +1519,7 @@ /* look for the CD-ROM, follows the procedure in the DOS driver */ inb(select_unit_reg); /* wait for 40 18 Hz ticks (reverse-engineered from DOS driver) */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout((HZ+17)*40/18); inb(result_reg); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/amiserial.c linux-ac/drivers/char/amiserial.c --- linux-2.4.15pre6/drivers/char/amiserial.c Mon Sep 17 04:22:56 2001 +++ linux-ac/drivers/char/amiserial.c Mon Nov 19 14:09:20 2001 @@ -1615,7 +1615,7 @@ info->tty = 0; if (info->blocked_open) { if (info->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(info->close_delay); } wake_up_interruptible(&info->open_wait); @@ -1676,14 +1676,14 @@ #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT printk("serdatr = %d (jiff=%lu)...", lsr, jiffies); #endif - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(char_time); if (signal_pending(current)) break; if (timeout && time_after(jiffies, orig_jiffies + timeout)) break; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies); #endif @@ -1837,7 +1837,7 @@ #endif schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&info->open_wait, &wait); if (extra_count) state->count++; diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/busmouse.c linux-ac/drivers/char/busmouse.c --- linux-2.4.15pre6/drivers/char/busmouse.c Fri Sep 7 16:28:38 2001 +++ linux-ac/drivers/char/busmouse.c Mon Nov 19 14:09:20 2001 @@ -266,7 +266,7 @@ goto repeat; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&mse->wait, &wait); if (signal_pending(current)) { diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/cyclades.c linux-ac/drivers/char/cyclades.c --- linux-2.4.15pre6/drivers/char/cyclades.c Fri Sep 14 21:04:07 2001 +++ linux-ac/drivers/char/cyclades.c Mon Nov 19 14:09:20 2001 @@ -2507,7 +2507,7 @@ firm_id = (struct FIRM_ID *) (base_addr + ID_ADDRESS); if (!ISZLOADED(*cinfo)){ - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&info->open_wait, &wait); return -EINVAL; } @@ -2558,7 +2558,7 @@ schedule(); } } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&info->open_wait, &wait); if (!tty_hung_up_p(filp)){ info->count++; @@ -2774,21 +2774,21 @@ #ifdef CY_DEBUG_WAIT_UNTIL_SENT printk("Not clean (jiff=%lu)...", jiffies); #endif - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(char_time); if (signal_pending(current)) break; if (timeout && time_after(jiffies, orig_jiffies + timeout)) break; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); } else { // Nothing to do! } /* Run one more char cycle */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(char_time * 5); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); #ifdef CY_DEBUG_WAIT_UNTIL_SENT printk("Clean (jiff=%lu)...done\n", jiffies); #endif @@ -2928,7 +2928,7 @@ if (info->blocked_open) { CY_UNLOCK(info, flags); if (info->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(info->close_delay); } wake_up_interruptible(&info->open_wait); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/dtlk.c linux-ac/drivers/char/dtlk.c --- linux-2.4.15pre6/drivers/char/dtlk.c Thu Sep 13 22:21:32 2001 +++ linux-ac/drivers/char/dtlk.c Mon Nov 19 14:09:20 2001 @@ -365,7 +365,7 @@ static void __exit dtlk_cleanup (void) { dtlk_write_bytes("goodbye", 8); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(5 * HZ / 10); /* nap 0.50 sec but could be awakened earlier by @@ -385,7 +385,7 @@ /* sleep for ms milliseconds */ static void dtlk_delay(int ms) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout((ms * HZ + 1000 - HZ) / 1000); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/dz.c linux-ac/drivers/char/dz.c --- linux-2.4.15pre6/drivers/char/dz.c Sun Sep 9 17:43:02 2001 +++ linux-ac/drivers/char/dz.c Mon Nov 19 14:09:20 2001 @@ -949,7 +949,7 @@ tmp = dz_in (info, DZ_TCR); tmp |= mask; - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); save_and_cli(flags); dz_out(info, DZ_TCR, tmp); @@ -1135,7 +1135,7 @@ } if (info->blocked_open) { if (info->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(info->close_delay); } wake_up_interruptible(&info->open_wait); @@ -1254,7 +1254,7 @@ schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue (&info->open_wait, &wait); if (!tty_hung_up_p(filp)) info->count++; diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/epca.c linux-ac/drivers/char/epca.c --- linux-2.4.15pre6/drivers/char/epca.c Fri Oct 12 20:48:42 2001 +++ linux-ac/drivers/char/epca.c Mon Nov 19 14:09:20 2001 @@ -598,7 +598,7 @@ if (ch->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(ch->close_delay); } @@ -1349,7 +1349,7 @@ } /* End forever while */ - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&ch->open_wait, &wait); cli(); if (!tty_hung_up_p(filp)) diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/i810_rng.c linux-ac/drivers/char/i810_rng.c --- linux-2.4.15pre6/drivers/char/i810_rng.c Thu Oct 11 16:14:32 2001 +++ linux-ac/drivers/char/i810_rng.c Mon Nov 19 14:09:20 2001 @@ -243,7 +243,7 @@ if (filp->f_flags & O_NONBLOCK) return ret ? : -EAGAIN; - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); if (signal_pending (current)) diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/ip2main.c linux-ac/drivers/char/ip2main.c --- linux-2.4.15pre6/drivers/char/ip2main.c Sat Nov 3 01:26:17 2001 +++ linux-ac/drivers/char/ip2main.c Mon Nov 19 14:09:20 2001 @@ -1863,7 +1883,7 @@ if (pCh->wopen) { if (pCh->ClosingDelay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(pCh->ClosingDelay); } wake_up_interruptible(&pCh->open_wait); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/n_r3964.c linux-ac/drivers/char/n_r3964.c --- linux-2.4.15pre6/drivers/char/n_r3964.c Thu Sep 13 22:21:32 2001 +++ linux-ac/drivers/char/n_r3964.c Mon Nov 19 14:09:20 2001 @@ -1266,14 +1266,14 @@ /* block until there is a message: */ add_wait_queue(&pInfo->read_wait, &wait); repeat: - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); pMsg = remove_msg(pInfo, pClient); if (!pMsg && !signal_pending(current)) { schedule(); goto repeat; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&pInfo->read_wait, &wait); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/n_tty.c linux-ac/drivers/char/n_tty.c --- linux-2.4.15pre6/drivers/char/n_tty.c Fri Apr 6 17:42:55 2001 +++ linux-ac/drivers/char/n_tty.c Mon Nov 19 14:09:20 2001 @@ -1044,7 +1044,7 @@ set_bit(TTY_DONT_FLIP, &tty->flags); continue; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); /* Deal with packet mode. */ if (tty->packet && b == buf) { @@ -1113,7 +1113,7 @@ if (!waitqueue_active(&tty->read_wait)) tty->minimum_to_wake = minimum; - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); size = b - buf; if (size) { retval = size; @@ -1189,7 +1189,7 @@ schedule(); } break_out: - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&tty->write_wait, &wait); return (b - buf) ? b - buf : retval; } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/nwflash.c linux-ac/drivers/char/nwflash.c --- linux-2.4.15pre6/drivers/char/nwflash.c Fri Oct 12 20:48:42 2001 +++ linux-ac/drivers/char/nwflash.c Mon Nov 19 14:09:20 2001 @@ -68,7 +68,7 @@ */ void flash_wait(int timeout) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(timeout); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/pc_keyb.c linux-ac/drivers/char/pc_keyb.c --- linux-2.4.15pre6/drivers/char/pc_keyb.c Mon Nov 19 13:40:54 2001 +++ linux-ac/drivers/char/pc_keyb.c Mon Nov 19 14:09:20 2001 @@ -1108,7 +1108,7 @@ schedule(); goto repeat; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&queue->proc_list, &wait); } while (i > 0 && !queue_empty()) { diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/pcxx.c linux-ac/drivers/char/pcxx.c --- linux-2.4.15pre6/drivers/char/pcxx.c Thu Sep 13 22:21:32 2001 +++ linux-ac/drivers/char/pcxx.c Mon Nov 19 14:09:20 2001 @@ -386,7 +386,7 @@ } schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&info->open_wait, &wait); if(!tty_hung_up_p(filp)) @@ -644,7 +644,7 @@ #endif if(info->blocked_open) { if(info->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(info->close_delay); } wake_up_interruptible(&info->open_wait); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/qpmouse.c linux-ac/drivers/char/qpmouse.c --- linux-2.4.15pre6/drivers/char/qpmouse.c Fri Sep 7 16:28:38 2001 +++ linux-ac/drivers/char/qpmouse.c Mon Nov 19 14:09:20 2001 @@ -243,7 +243,7 @@ if (inb_p(qp_status)&(QP_RX_FULL)) inb_p(qp_data); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout((5*HZ + 99) / 100); retries++; } @@ -271,7 +271,7 @@ schedule(); goto repeat; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&queue->proc_list, &wait); } while (i > 0 && !queue_empty()) { diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/qtronix.c linux-ac/drivers/char/qtronix.c --- linux-2.4.15pre6/drivers/char/qtronix.c Sun Sep 9 17:43:02 2001 +++ linux-ac/drivers/char/qtronix.c Mon Nov 19 14:09:20 2001 @@ -529,7 +529,7 @@ schedule(); goto repeat; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&queue->proc_list, &wait); } while (i > 0 && !queue_empty()) { diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/riscom8.c linux-ac/drivers/char/riscom8.c --- linux-2.4.15pre6/drivers/char/riscom8.c Thu Sep 13 22:21:32 2001 +++ linux-ac/drivers/char/riscom8.c Mon Nov 19 14:09:20 2001 @@ -1069,7 +1069,7 @@ } schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&port->open_wait, &wait); if (!tty_hung_up_p(filp)) port->count++; @@ -1191,7 +1191,7 @@ */ timeout = jiffies+HZ; while(port->IER & IER_TXEMPTY) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(port->timeout); if (time_after(jiffies, timeout)) break; @@ -1207,7 +1207,7 @@ port->tty = 0; if (port->blocked_open) { if (port->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(port->close_delay); } wake_up_interruptible(&port->open_wait); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/rocket.c linux-ac/drivers/char/rocket.c --- linux-2.4.15pre6/drivers/char/rocket.c Fri Sep 21 17:55:22 2001 +++ linux-ac/drivers/char/rocket.c Mon Nov 19 14:09:20 2001 @@ -869,7 +869,7 @@ #endif schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&info->open_wait, &wait); cli(); if (extra_count) @@ -1134,7 +1134,7 @@ xmit_flags[info->line >> 5] &= ~(1 << (info->line & 0x1f)); if (info->blocked_open) { if (info->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(info->close_delay); } wake_up_interruptible(&info->open_wait); @@ -1221,7 +1221,7 @@ #if (LINUX_VERSION_CODE < 131394) /* Linux 2.1.66 */ static void send_break( struct r_port * info, int duration) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); cli(); sSendBreak(&info->channel); schedule_timeout(duration); @@ -1616,12 +1616,12 @@ printk("txcnt = %d (jiff=%lu,check=%d)...", txcnt, jiffies, check_time); #endif - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(check_time); if (signal_pending(current)) break; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); #ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT printk("txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies); #endif diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/rtc.c linux-ac/drivers/char/rtc.c --- linux-2.4.15pre6/drivers/char/rtc.c Mon Nov 19 13:40:54 2001 +++ linux-ac/drivers/char/rtc.c Mon Nov 19 14:09:20 2001 @@ -208,7 +208,7 @@ add_wait_queue(&rtc_wait, &wait); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); do { /* First make it right. Then make it fast. Putting this whole @@ -237,7 +232,7 @@ if (!retval) retval = sizeof(unsigned long); out: - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&rtc_wait, &wait); return retval; diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/selection.c linux-ac/drivers/char/selection.c --- linux-2.4.15pre6/drivers/char/selection.c Fri Sep 7 16:28:38 2001 +++ linux-ac/drivers/char/selection.c Mon Nov 19 14:09:20 2001 @@ -306,7 +306,7 @@ pasted += count; } remove_wait_queue(&vt->paste_wait, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); return 0; } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/serial.c linux-ac/drivers/char/serial.c --- linux-2.4.15pre6/drivers/char/serial.c Mon Nov 19 13:40:54 2001 +++ linux-ac/drivers/char/serial.c Mon Nov 19 14:09:20 2001 @@ -2383,7 +2383,7 @@ { if (!CONFIGURED_SERIAL_PORT(info)) return; - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); current->timeout = jiffies + duration; cli(); info->LCR |= UART_LCR_SBC; diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/serial167.c linux-ac/drivers/char/serial167.c --- linux-2.4.15pre6/drivers/char/serial167.c Mon Sep 17 04:23:07 2001 +++ linux-ac/drivers/char/serial167.c Mon Nov 19 14:09:20 2001 @@ -1929,7 +1929,7 @@ } if (info->blocked_open) { if (info->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(info->close_delay); } wake_up_interruptible(&info->open_wait); @@ -2103,7 +2103,7 @@ #endif schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&info->open_wait, &wait); if (!tty_hung_up_p(filp)){ info->count++; diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/serial_21285.c linux-ac/drivers/char/serial_21285.c --- linux-2.4.15pre6/drivers/char/serial_21285.c Thu Sep 13 22:21:32 2001 +++ linux-ac/drivers/char/serial_21285.c Mon Nov 19 14:09:20 2001 @@ -249,14 +249,14 @@ { int orig_jiffies = jiffies; while (*CSR_UARTFLG & 8) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); if (signal_pending(current)) break; if (timeout && time_after(jiffies, orig_jiffies + timeout)) break; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); } static int rs285_open(struct tty_struct *tty, struct file *filp) diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/sonypi.c linux-ac/drivers/char/sonypi.c --- linux-2.4.15pre6/drivers/char/sonypi.c Mon Oct 15 15:38:31 2001 +++ linux-ac/drivers/char/sonypi.c Mon Nov 19 14:09:20 2001 @@ -483,7 +483,7 @@ schedule(); goto repeat; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&sonypi_device.queue.proc_list, &wait); } while (i > 0 && !sonypi_emptyq()) { diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/specialix.c linux-ac/drivers/char/specialix.c --- linux-2.4.15pre6/drivers/char/specialix.c Mon Nov 19 13:40:54 2001 +++ linux-ac/drivers/char/specialix.c Mon Nov 19 14:09:20 2001 @@ -1434,7 +1434,7 @@ } schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&port->open_wait, &wait); if (!tty_hung_up_p(filp)) port->count++; @@ -1567,7 +1567,7 @@ */ timeout = jiffies+HZ; while(port->IER & IER_TXEMPTY) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(port->timeout); if (time_after(jiffies, timeout)) { printk (KERN_INFO "Timeout waiting for close\n"); @@ -1586,7 +1586,7 @@ port->tty = 0; if (port->blocked_open) { if (port->close_delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(port->close_delay); } wake_up_interruptible(&port->open_wait); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/stallion.c linux-ac/drivers/char/stallion.c --- linux-2.4.15pre6/drivers/char/stallion.c Fri Sep 21 17:55:23 2001 +++ linux-ac/drivers/char/stallion.c Mon Nov 19 14:09:20 2001 @@ -1283,9 +1283,9 @@ printk("stl_delay(len=%d)\n", len); #endif if (len > 0) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(len); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); } } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/sx.c linux-ac/drivers/char/sx.c --- linux-2.4.15pre6/drivers/char/sx.c Mon Nov 19 13:40:54 2001 +++ linux-ac/drivers/char/sx.c Mon Nov 19 14:09:20 2001 @@ -1550,12 +1550,12 @@ sx_send_command (port, HS_CLOSE, 0, 0); while (to-- && (sx_read_channel_byte (port, hi_hstat) != HS_IDLE_CLOSED)) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout (1); if (signal_pending (current)) break; } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); if (sx_read_channel_byte (port, hi_hstat) != HS_IDLE_CLOSED) { if (sx_send_command (port, HS_FORCE_CLOSED, -1, HS_IDLE_CLOSED) != 1) { printk (KERN_ERR diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/tpqic02.c linux-ac/drivers/char/tpqic02.c --- linux-2.4.15pre6/drivers/char/tpqic02.c Fri Sep 14 21:40:00 2001 +++ linux-ac/drivers/char/tpqic02.c Mon Nov 19 14:09:20 2001 @@ -598,7 +598,7 @@ /* not ready and no exception && timeout not expired yet */ while (((stat = inb_p(QIC02_STAT_PORT) & QIC02_STAT_MASK) == QIC02_STAT_MASK) && time_before(jiffies, spin_t)) { /* be `nice` to other processes on long operations... */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); /* nap 0.30 sec between checks, */ /* but could be woken up earlier by signals... */ schedule_timeout(3 * HZ / 10); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/tty_ioctl.c linux-ac/drivers/char/tty_ioctl.c --- linux-2.4.15pre6/drivers/char/tty_ioctl.c Tue Sep 18 05:52:35 2001 +++ linux-ac/drivers/char/tty_ioctl.c Mon Nov 19 14:09:20 2001 @@ -65,7 +65,7 @@ if (tty->driver.wait_until_sent) tty->driver.wait_until_sent(tty, timeout); stop_waiting: - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&tty->write_wait, &wait); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/char/vt.c linux-ac/drivers/char/vt.c --- linux-2.4.15pre6/drivers/char/vt.c Mon Nov 19 13:40:54 2001 +++ linux-ac/drivers/char/vt.c Mon Nov 19 14:09:20 2001 @@ -1144,7 +1144,7 @@ schedule(); } remove_wait_queue(&vt_activate_queue, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); return retval; } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/input/evdev.c linux-ac/drivers/input/evdev.c --- linux-2.4.15pre6/drivers/input/evdev.c Sun Sep 30 19:26:05 2001 +++ linux-ac/drivers/input/evdev.c Mon Nov 19 14:09:21 2001 @@ -169,7 +169,7 @@ if (list->head == list->tail) { add_wait_queue(&list->evdev->wait, &wait); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); while (list->head == list->tail) { @@ -189,7 +189,7 @@ schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&list->evdev->wait, &wait); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/input/joydev.c linux-ac/drivers/input/joydev.c --- linux-2.4.15pre6/drivers/input/joydev.c Sun Sep 30 19:26:05 2001 +++ linux-ac/drivers/input/joydev.c Mon Nov 19 14:09:21 2001 @@ -252,7 +252,7 @@ if (list->head == list->tail && list->startup == joydev->nabs + joydev->nkey) { add_wait_queue(&list->joydev->wait, &wait); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); while (list->head == list->tail) { @@ -268,7 +268,7 @@ schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&list->joydev->wait, &wait); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/input/mousedev.c linux-ac/drivers/input/mousedev.c --- linux-2.4.15pre6/drivers/input/mousedev.c Sun Sep 30 19:26:05 2001 +++ linux-ac/drivers/input/mousedev.c Mon Nov 19 14:09:21 2001 @@ -346,7 +346,7 @@ if (!list->ready && !list->buffer) { add_wait_queue(&list->mousedev->wait, &wait); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); while (!list->ready) { @@ -362,7 +362,7 @@ schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&list->mousedev->wait, &wait); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/message/fusion/mptbase.c linux-ac/drivers/message/fusion/mptbase.c --- linux-2.4.15pre6/drivers/message/fusion/mptbase.c Sun Sep 30 19:26:06 2001 +++ linux-ac/drivers/message/fusion/mptbase.c Mon Nov 19 14:09:21 2001 @@ -1665,7 +1665,7 @@ return -ETIME; } - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); } @@ -1969,7 +1969,7 @@ cntdn = HZ * 60; /* chg'd from 30 to 60 seconds */ state = GetIocState(ioc, 1); while (state != MPI_IOC_STATE_OPERATIONAL && --cntdn) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); if (!cntdn) { @@ -2096,7 +2096,7 @@ return hard_reset_done; } /* udelay(10000) ? */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); } @@ -2172,7 +2172,7 @@ ioc->name)); /* want udelay(100) */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); /* Write magic sequence to WriteSequence register */ @@ -2552,7 +2552,7 @@ intstat = CHIPREG_READ32(&ioc->chip->IntStatus); if (! (intstat & MPI_HIS_IOP_DOORBELL_STATUS)) break; - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); count++; } @@ -2590,7 +2590,7 @@ intstat = CHIPREG_READ32(&ioc->chip->IntStatus); if (intstat & MPI_HIS_DOORBELL_INTERRUPT) break; - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); count++; } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/message/fusion/mptlan.c linux-ac/drivers/message/fusion/mptlan.c --- linux-2.4.15pre6/drivers/message/fusion/mptlan.c Sun Sep 30 19:26:06 2001 +++ linux-ac/drivers/message/fusion/mptlan.c Mon Nov 19 14:09:21 2001 @@ -537,7 +537,7 @@ timeout = 2 * HZ; while (atomic_read(&priv->buckets_out) && --timeout) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/message/fusion/mptscsih.c linux-ac/drivers/message/fusion/mptscsih.c --- linux-2.4.15pre6/drivers/message/fusion/mptscsih.c Sun Sep 30 19:26:06 2001 +++ linux-ac/drivers/message/fusion/mptscsih.c Mon Nov 19 14:09:21 2001 @@ -713,7 +713,7 @@ spin_unlock_irqrestore(&mpt_scsih_taskQ_lock, flags); while(mpt_scsih_taskQ_bh_active && --count) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); } if (!count) @@ -1701,7 +1701,7 @@ spin_unlock_irqrestore(&mpt_scsih_taskQ_lock, flags); while (1) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ/4); /* @@ -1804,7 +1804,7 @@ } else { /* Spin-Wait for TaskMgmt complete!!! */ while (mpt_scsih_active_taskmgmt_mf != NULL) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ/4); } } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/net/wireless/airport.c linux-ac/drivers/net/wireless/airport.c --- linux-2.4.15pre6/drivers/net/wireless/airport.c Wed Oct 17 21:37:01 2001 +++ linux-ac/drivers/net/wireless/airport.c Mon Nov 19 14:09:21 2001 @@ -235,7 +235,7 @@ /* Power up card */ feature_set_airport_power(card->node, 1); - current->state = TASK_UNINTERRUPTIBLE; + set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ); /* Reset it before we get the interrupt */ @@ -305,7 +305,7 @@ // ndev->base_addr = 0; feature_set_airport_power(card->node, 0); - current->state = TASK_UNINTERRUPTIBLE; + set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ); kfree(card); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/pci/pci.c linux-ac/drivers/pci/pci.c --- linux-2.4.15pre6/drivers/pci/pci.c Mon Nov 19 13:40:55 2001 +++ linux-ac/drivers/pci/pci.c Mon Nov 19 14:09:21 2001 @@ -1822,13 +1864,13 @@ if (mem_flags == SLAB_KERNEL) { DECLARE_WAITQUEUE (wait, current); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); add_wait_queue (&pool->waitq, &wait); spin_unlock_irqrestore (&pool->lock, flags); schedule_timeout (POOL_TIMEOUT_JIFFIES); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue (&pool->waitq, &wait); goto restart; } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/scsi/sd.c linux-ac/drivers/scsi/sd.c --- linux-2.4.15pre6/drivers/scsi/sd.c Mon Nov 19 13:40:56 2001 +++ linux-ac/drivers/scsi/sd.c Mon Nov 19 14:09:21 2001 @@ -845,7 +844,7 @@ time1 = HZ; /* Wait 1 second for next try */ do { - current->state = TASK_UNINTERRUPTIBLE; + set_current_state(TASK_UNINTERRUPTIBLE); time1 = schedule_timeout(time1); } while(time1); printk("."); diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/awe_wave.c linux-ac/drivers/sound/awe_wave.c --- linux-2.4.15pre6/drivers/sound/awe_wave.c Sun Sep 30 19:26:08 2001 +++ linux-ac/drivers/sound/awe_wave.c Mon Nov 19 14:09:22 2001 @@ -724,7 +724,7 @@ static void awe_wait(unsigned short delay) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout((HZ*(unsigned long)delay + 44099)/44100); } /* diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/btaudio.c linux-ac/drivers/sound/btaudio.c --- linux-2.4.15pre6/drivers/sound/btaudio.c Wed Oct 17 21:19:20 2001 +++ linux-ac/drivers/sound/btaudio.c Mon Nov 19 14:09:22 2001 @@ -526,7 +526,7 @@ break; } up(&bta->lock); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule(); down(&bta->lock); if(signal_pending(current)) { @@ -603,7 +603,7 @@ } up(&bta->lock); remove_wait_queue(&bta->readq, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); return ret; } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/cs4232.c linux-ac/drivers/sound/cs4232.c --- linux-2.4.15pre6/drivers/sound/cs4232.c Sun Sep 30 19:26:08 2001 +++ linux-ac/drivers/sound/cs4232.c Mon Nov 19 14:09:22 2001 @@ -93,7 +93,7 @@ static void sleep(unsigned howlong) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(howlong); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/cs46xx.c linux-ac/drivers/sound/cs46xx.c --- linux-2.4.15pre6/drivers/sound/cs46xx.c Sun Sep 30 19:26:08 2001 +++ linux-ac/drivers/sound/cs46xx.c Mon Nov 19 14:09:22 2001 @@ -1483,7 +1483,7 @@ for (;;) { /* It seems that we have to set the current state to TASK_INTERRUPTIBLE every time to make the process really go to sleep */ - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); spin_lock_irqsave(&state->card->lock, flags); count = dmabuf->count; @@ -1497,7 +1497,7 @@ if (nonblock) { remove_wait_queue(&dmabuf->wait, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); return -EBUSY; } @@ -1511,7 +1511,7 @@ } } remove_wait_queue(&dmabuf->wait, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); if (signal_pending(current)) { CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: drain_dac()- -ERESTARTSYS\n")); @@ -1900,7 +1900,7 @@ unsigned count, tmo; if (file->f_mode & FMODE_WRITE) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); add_wait_queue(&card->midi.owait, &wait); for (;;) { spin_lock_irqsave(&card->midi.lock, flags); @@ -1912,7 +1912,7 @@ break; if (file->f_flags & O_NONBLOCK) { remove_wait_queue(&card->midi.owait, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); return -EBUSY; } tmo = (count * HZ) / 3100; @@ -1920,7 +1920,7 @@ printk(KERN_DEBUG "cs46xx: midi timed out??\n"); } remove_wait_queue(&card->midi.owait, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); } down(&card->midi.open_sem); card->midi.open_mode &= (~(file->f_mode & (FMODE_READ | FMODE_WRITE))); @@ -5050,7 +5050,7 @@ */ if (cs461x_peekBA0(card, BA0_ACSTS) & ACSTS_CRDY) break; - current->state = TASK_UNINTERRUPTIBLE; + set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(1); } while (time_before(jiffies, end_time)); } @@ -5098,7 +5098,7 @@ */ if ((cs461x_peekBA0(card, BA0_ACISV) & (ACISV_ISV3 | ACISV_ISV4)) == (ACISV_ISV3 | ACISV_ISV4)) break; - current->state = TASK_UNINTERRUPTIBLE; + set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(1); } while (time_before(jiffies, end_time)); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/maestro.c linux-ac/drivers/sound/maestro.c --- linux-2.4.15pre6/drivers/sound/maestro.c Sun Sep 30 19:26:08 2001 +++ linux-ac/drivers/sound/maestro.c Mon Nov 19 14:09:22 2001 @@ -2184,7 +2184,7 @@ if (s->dma_dac.mapped || !s->dma_dac.ready) return 0; - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); add_wait_queue(&s->dma_dac.wait, &wait); for (;;) { /* XXX uhm.. questionable locking*/ @@ -2197,7 +2197,7 @@ break; if (nonblock) { remove_wait_queue(&s->dma_dac.wait, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); return -EBUSY; } tmo = (count * HZ) / s->ratedac; @@ -2208,7 +2208,7 @@ M_printk(KERN_DEBUG "maestro: dma timed out?? %ld\n",jiffies); } remove_wait_queue(&s->dma_dac.wait, &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); if (signal_pending(current)) return -ERESTARTSYS; return 0; @@ -3657,10 +3657,10 @@ card->in_suspend++; add_wait_queue(&(card->suspend_queue), &wait); - current->state = TASK_UNINTERRUPTIBLE; + set_current_state(TASK_UNINTERRUPTIBLE); schedule(); remove_wait_queue(&(card->suspend_queue), &wait); - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); } static int diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/maui.c linux-ac/drivers/sound/maui.c --- linux-2.4.15pre6/drivers/sound/maui.c Sun Sep 30 19:26:08 2001 +++ linux-ac/drivers/sound/maui.c Mon Nov 19 14:09:22 2001 @@ -76,7 +76,7 @@ for (i = 0; i < 150; i++) { if (inb(HOST_STAT_PORT) & mask) return 1; - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ / 10); if (signal_pending(current)) return 0; diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/msnd_pinnacle.c linux-ac/drivers/sound/msnd_pinnacle.c --- linux-2.4.15pre6/drivers/sound/msnd_pinnacle.c Sun Sep 30 19:26:08 2001 +++ linux-ac/drivers/sound/msnd_pinnacle.c Mon Nov 19 14:09:22 2001 @@ -666,7 +666,7 @@ get_play_delay_jiffies(dev.DAPF.len)); clear_bit(F_WRITEFLUSH, &dev.flags); if (!signal_pending(current)) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(get_play_delay_jiffies(DAP_BUFF_SIZE)); } clear_bit(F_WRITING, &dev.flags); @@ -1248,7 +1248,7 @@ & ~0x0001, dev.SMA + SMA_wCurrHostStatusFlags); if (msnd_send_word(&dev, 0, 0, HDEXAR_CAL_A_TO_D) == 0 && chk_send_dsp_cmd(&dev, HDEX_AUX_REQ) == 0) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ / 3); return 0; } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/sgalaxy.c linux-ac/drivers/sound/sgalaxy.c --- linux-2.4.15pre6/drivers/sound/sgalaxy.c Sun Sep 30 19:26:08 2001 +++ linux-ac/drivers/sound/sgalaxy.c Mon Nov 19 14:09:22 2001 @@ -30,7 +30,7 @@ static void sleep( unsigned howlong ) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(howlong); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/sscape.c linux-ac/drivers/sound/sscape.c --- linux-2.4.15pre6/drivers/sound/sscape.c Sun Sep 30 19:26:08 2001 +++ linux-ac/drivers/sound/sscape.c Mon Nov 19 14:09:22 2001 @@ -156,7 +156,7 @@ static void sleep(unsigned howlong) { - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(howlong); } diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/drivers/sound/vwsnd.c linux-ac/drivers/sound/vwsnd.c --- linux-2.4.15pre6/drivers/sound/vwsnd.c Mon Nov 19 13:40:56 2001 +++ linux-ac/drivers/sound/vwsnd.c Mon Nov 19 14:09:22 2001 @@ -1839,7 +1839,7 @@ break; schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&aport->queue, &wait); li_disable_interrupts(&devc->lith, mask); if (aport == &devc->rport) @@ -2209,7 +2209,7 @@ break; schedule(); } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&wport->queue, &wait); DBGPV("swstate = %d, hwstate = %d\n", wport->swstate, wport->hwstate); DBGRV(); @@ -2285,18 +2285,18 @@ set_current_state(TASK_INTERRUPTIBLE); if (rport->flags & DISABLED || file->f_flags & O_NONBLOCK) { - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&rport->queue, &wait); return ret ? ret : -EAGAIN; } schedule(); if (signal_pending(current)) { - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&rport->queue, &wait); return ret ? ret : -ERESTARTSYS; } } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&rport->queue, &wait); pcm_input(devc, 0, 0); /* nb bytes are available in userbuf. */ @@ -2360,18 +2360,18 @@ set_current_state(TASK_INTERRUPTIBLE); if (wport->flags & DISABLED || file->f_flags & O_NONBLOCK) { - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&wport->queue, &wait); return ret ? ret : -EAGAIN; } schedule(); if (signal_pending(current)) { - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&wport->queue, &wait); return ret ? ret : -ERESTARTSYS; } } - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&wport->queue, &wait); /* nb bytes are available in userbuf. */ if (nb > count)