patch-2.4.22 linux-2.4.22/arch/arm/mach-sa1100/dma-sa1100.c

Next file: linux-2.4.22/arch/arm/mach-sa1100/dma-sa1111.c
Previous file: linux-2.4.22/arch/arm/mach-sa1100/cpu-sa1110.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/arch/arm/mach-sa1100/dma-sa1100.c linux-2.4.22/arch/arm/mach-sa1100/dma-sa1100.c
@@ -477,11 +477,11 @@
 		return sa1111_dma_resume(channel);
 
 	if (dma->stopped) {
-		int flags;
-		save_flags_cli(flags);
+		unsigned long flags;
+		local_irq_save(flags);
 		dma->stopped = 0;
 		process_dma(dma);
-		restore_flags(flags);
+		local_irq_restore(flags);
 	}
 	return 0;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)