fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-x86_64 / mach-xen / asm / floppy.h

diff --git a/include/asm-x86_64/mach-xen/asm/floppy.h b/include/asm-x86_64/mach-xen/asm/floppy.h
index d1027d8..82e0a90 100644 (file)
--- a/include/asm-x86_64/mach-xen/asm/floppy.h
+++ b/include/asm-x86_64/mach-xen/asm/floppy.h
@@ -14,6 +14,7 @@
 
 #include <linux/vmalloc.h>
 
+
 /*
  * The DMA channel used by the floppy controller cannot access data at
  * addresses >= 16MB
@@ -54,7 +55,7 @@ static char *virtual_dma_addr;
 static int virtual_dma_mode;
 static int doing_pdma;
 
-static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
+static irqreturn_t floppy_hardint(int irq, void *dev_id)
 {
        register unsigned char st;
 
@@ -66,7 +67,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
        static int dma_wait=0;
 #endif
        if (!doing_pdma)
-               return floppy_interrupt(irq, dev_id, regs);
+               return floppy_interrupt(irq, dev_id);
 
 #ifdef TRACE_FLPY_INT
        if(!calls)
@@ -109,7 +110,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
                dma_wait=0;
 #endif
                doing_pdma = 0;
-               floppy_interrupt(irq, dev_id, regs);
+               floppy_interrupt(irq, dev_id);
                return IRQ_HANDLED;
        }
 #ifdef TRACE_FLPY_INT
@@ -134,8 +135,8 @@ static int vdma_get_dma_residue(unsigned int dummy)
 
 static int fd_request_irq(void)
 {
-       return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
-                                          "floppy", NULL);
+       return request_irq(FLOPPY_IRQ, floppy_hardint,
+                          IRQF_DISABLED, "floppy", NULL);
 }
 
 #if 0