git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[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
..
6ea13c3
100644
(file)
--- a/
include/asm-x86_64/floppy.h
+++ b/
include/asm-x86_64/floppy.h
@@
-51,7
+51,7
@@
static char *virtual_dma_addr;
static int virtual_dma_mode;
static int doing_pdma;
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;
{
register unsigned char st;
@@
-63,7
+63,7
@@
static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
static int dma_wait=0;
#endif
if (!doing_pdma)
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)
#ifdef TRACE_FLPY_INT
if(!calls)
@@
-106,7
+106,7
@@
static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
dma_wait=0;
#endif
doing_pdma = 0;
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
return IRQ_HANDLED;
}
#ifdef TRACE_FLPY_INT
@@
-144,18
+144,16
@@
static int vdma_get_dma_residue(unsigned int dummy)
static int fd_request_irq(void)
{
if(can_use_virtual_dma)
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,
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)
{
}
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)
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));
}
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;
}
return 0;
}
-struct fd_routine_l {
+st
atic st
ruct 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);
int (*_request_dma)(unsigned int dmanr, const char * device_id);
void (*_free_dma)(unsigned int dmanr);
int (*_get_dma_residue)(unsigned int dummy);