Dunno if anyone cares, dunno if its actually neccessary given the local_irq_save but it cuts down on the noise when removing deprecated bits and it seems trivial ... Signed-off-by: Alan Cox <alan@xxxxxxxxxx> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.17-rc6/drivers/scsi/atari_scsi.c linux-2.6.17-rc6/drivers/scsi/atari_scsi.c --- linux.vanilla-2.6.17-rc6/drivers/scsi/atari_scsi.c 2006-06-06 14:01:13.000000000 +0100 +++ linux-2.6.17-rc6/drivers/scsi/atari_scsi.c 2006-06-14 18:03:03.000000000 +0100 @@ -559,8 +559,8 @@ local_irq_save(flags); - while( !in_interrupt() && falcon_got_lock && stdma_others_waiting() ) - sleep_on( &falcon_fairness_wait ); + if( !in_interrupt()) + wait_event(&falcon_fairness_wait, falcon_got_lock && stdma_others_waiting()); while (!falcon_got_lock) { if (in_interrupt()) @@ -573,7 +573,7 @@ wake_up( &falcon_try_wait ); } else { - sleep_on( &falcon_try_wait ); + wait_event(&falcon_try_wait, !falcon_trying_lock ); } } - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html