ChangeSet 1.2219, 2005/03/26 13:43:09-08:00, [EMAIL PROTECTED]
[PATCH] M68k/stdma: Replace sleep_on() with wait_event()
M68k/stdma: Use wait_event() instead of the deprecated sleep_on()
function.
Since wait_event() expects the condition passed in to be the stopping
condition, negate the current one.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
Signed-off-by: Geert Uytterhoeven <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
stdma.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -Nru a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c
--- a/arch/m68k/atari/stdma.c 2005-03-26 17:30:38 -08:00
+++ b/arch/m68k/atari/stdma.c 2005-03-26 17:30:38 -08:00
@@ -34,6 +34,7 @@
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/wait.h>
#include <asm/atari_stdma.h>
#include <asm/atariints.h>
@@ -81,11 +82,10 @@
local_irq_save(flags); /* protect lock */
- while(stdma_locked)
- /* Since the DMA is used for file system purposes, we
- have to sleep uninterruptible (there may be locked
- buffers) */
- sleep_on(&stdma_wait);
+ /* Since the DMA is used for file system purposes, we
+ have to sleep uninterruptible (there may be locked
+ buffers) */
+ wait_event(stdma_wait, !stdma_locked);
stdma_locked = 1;
stdma_isr = handler;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
