BLT -> DIS : CONFIG_CPUSETS

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

diff --git a/include/asm-x86_64/floppy.h b/include/asm-x86_64/floppy.h
index 2f2df23..32ff5d1 100644 (file)
--- a/include/asm-x86_64/floppy.h
+++ b/include/asm-x86_64/floppy.h
@@ -144,18 +144,16 @@ static int vdma_get_dma_residue(unsigned int dummy)
 static int fd_request_irq(void)
 {
        if(can_use_virtual_dma)
-               return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
-                                                  "floppy", NULL);
+               return request_irq(FLOPPY_IRQ, floppy_hardint,
+                                  IRQF_DISABLED, "floppy", NULL);
        else
                return request_irq(FLOPPY_IRQ, floppy_interrupt,
-                                                  SA_INTERRUPT|SA_SAMPLE_RANDOM,
-                                                  "floppy", NULL);     
-
+                                  IRQF_DISABLED, "floppy", NULL);
 }
 
 static unsigned long dma_mem_alloc(unsigned long size)
 {
-       return __get_dma_pages(GFP_KERNEL,get_order(size));
+       return __get_dma_pages(GFP_KERNEL|__GFP_NORETRY,get_order(size));
 }
 
 
@@ -170,7 +168,7 @@ static unsigned long vdma_mem_alloc(unsigned long size)
 static void _fd_dma_mem_free(unsigned long addr, unsigned long size)
 {
        if((unsigned long) addr >= (unsigned long) high_memory)
-               return vfree((void *)addr);
+               vfree((void *)addr);
        else
                free_pages(addr, get_order(size));              
 }
@@ -223,7 +221,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io)
        return 0;
 }
 
-struct fd_routine_l {
+static struct fd_routine_l {
        int (*_request_dma)(unsigned int dmanr, const char * device_id);
        void (*_free_dma)(unsigned int dmanr);
        int (*_get_dma_residue)(unsigned int dummy);