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

[James Nelson]

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

Signed-off-by: James Nelson <james4765@xxxxxxxxx>

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 */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/