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-i386
/
mach-xen
/
asm
/
floppy.h
diff --git
a/include/asm-i386/mach-xen/asm/floppy.h
b/include/asm-i386/mach-xen/asm/floppy.h
index
2d5dd22
..
6caa28f
100644
(file)
--- a/
include/asm-i386/mach-xen/asm/floppy.h
+++ b/
include/asm-i386/mach-xen/asm/floppy.h
@@
-43,14
+43,14
@@
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 int lcount;
register char *lptr;
if (!doing_pdma)
{
register unsigned char st;
register int lcount;
register char *lptr;
if (!doing_pdma)
- return floppy_interrupt(irq, dev_id
, regs
);
+ return floppy_interrupt(irq, dev_id);
st = 1;
for(lcount=virtual_dma_count, lptr=virtual_dma_addr;
st = 1;
for(lcount=virtual_dma_count, lptr=virtual_dma_addr;
@@
-73,7
+73,7
@@
static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
virtual_dma_residue += virtual_dma_count;
virtual_dma_count=0;
doing_pdma = 0;
virtual_dma_residue += virtual_dma_count;
virtual_dma_count=0;
doing_pdma = 0;
- floppy_interrupt(irq, dev_id
, regs
);
+ floppy_interrupt(irq, dev_id);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
return IRQ_HANDLED;
}
return IRQ_HANDLED;
@@
-88,8
+88,8
@@
static void fd_disable_dma(void)
static int fd_request_irq(void)
{
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);
}
static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)
}
static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)