patch-2.1.110 linux/arch/arm/kernel/dma-rpc.c

• Lines: 27
• Date: Sat Jul 18 11:55:23 1998
• Orig file: v2.1.109/linux/arch/arm/kernel/dma-rpc.c
• Orig date: Tue Apr 14 14:29:19 1998

diff -u --recursive --new-file v2.1.109/linux/arch/arm/kernel/dma-rpc.c linux/arch/arm/kernel/dma-rpc.c
@@ -13,12 +13,15 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/dma.h>
+#include <asm/fiq.h>
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/uaccess.h>
 
 #include "dma.h"
 
+static struct fiq_handler fh = { "floppydma", NULL };
+
 #if 0
 typedef enum {
 	dma_size_8	= 1,
@@ -269,6 +272,10 @@
 			extern unsigned char floppy_fiqout_start, floppy_fiqout_end;
 			fiqhandler_start = &floppy_fiqout_start;
 			fiqhandler_length = &floppy_fiqout_end - &floppy_fiqout_start;
+		}
+		if (claim_fiq(&fh)) {
+			printk("floppydma: couldn't claim FIQ.\n");
+			return;
 		}
 		/* Allow access to page 0 via domains */
 		__asm__ __volatile__("mcr	p15, 0, %0, c3, c0" :