2005-01-05 01:59:55

by James Nelson

Subject: [PATCH] arm26: update irq handling code in arch/arm26/machine/dma.c

Remove to-be-deprecated function save_flags() and nonexistent function local_save_flags_cli()

Signed-off-by: James Nelson <[email protected]>

diff -urN --exclude='*~' linux-2.6.10-mm1-original/arch/arm26/machine/dma.c linux-2.6.10-mm1/arch/arm26/machine/dma.c
--- linux-2.6.10-mm1-original/arch/arm26/machine/dma.c 2005-01-03 18:42:35.631091938 -0500
+++ linux-2.6.10-mm1/arch/arm26/machine/dma.c 2005-01-04 20:52:17.051263510 -0500
@@ -40,7 +40,7 @@
case DMA_MODE_READ: { /* read */
unsigned long flags;
DPRINTK("enable_dma fdc1772 data read\n");
- local_save_flags_cli(flags);
+ local_irq_save(flags);
clf();

memcpy ((void *)0x1c, (void *)&fdc1772_dma_read,
@@ -54,7 +54,7 @@
case DMA_MODE_WRITE: { /* write */
unsigned long flags;
DPRINTK("enable_dma fdc1772 data write\n");
- local_save_flags_cli(flags);
+ local_irq_save(flags);
clf();
memcpy ((void *)0x1c, (void *)&fdc1772_dma_write,
&fdc1772_dma_write_end - &fdc1772_dma_write);
@@ -85,7 +85,7 @@

DPRINTK("arc_floppy_cmdend_enable_dma\n");
/*printk("enable_dma fdc1772 command end FIQ\n");*/
- save_flags(flags);
+ local_irq_save(flags);
clf();

/* B fdc1772_comendhandler */

2005-01-06 02:18:18

by Ian molton

Subject: Re: [PATCH] arm26: update irq handling code in arch/arm26/machine/dma.c

James Nelson wrote:
> Remove to-be-deprecated function save_flags() and nonexistent function local_save_flags_cli()
>
> Signed-off-by: James Nelson <[email protected]>

I've applied this to my tree.

About the signing off thing - do I assume that since its posted here,
someone else will forward it on, or should I sign off on it and send it
to who I think it should go to?