Log message:
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]>
Modified files:
linux/arch/m68k/atari:
stdma.c
Index: linux/arch/m68k/atari/stdma.c
Stats: 1 insertion, 9 modifications
http://linux-m68k-cvs.ubb.ca/c/cvsweb/linux/arch/m68k/atari/stdma%2ec.diff?r1=1.7&r2=1.8
========================================================================
--- stdma.c 5 Apr 2004 13:09:01 -0000 1.7
+++ stdma.c 20 Mar 2005 20:51:12 -0000 1.8
@@ -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 linux-m68k-cvscommit"
in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
