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]
/
arch
/
arm
/
mach-rpc
/
dma.c
diff --git
a/arch/arm/mach-rpc/dma.c
b/arch/arm/mach-rpc/dma.c
index
bd86ffb
..
596379a
100644
(file)
--- a/
arch/arm/mach-rpc/dma.c
+++ b/
arch/arm/mach-rpc/dma.c
@@
-83,7
+83,7
@@
static void iomd_get_next_sg(struct scatterlist *sg, dma_t *dma)
sg->length |= flags;
}
sg->length |= flags;
}
-static irqreturn_t iomd_dma_handle(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t iomd_dma_handle(int irq, void *dev_id)
{
dma_t *dma = (dma_t *)dev_id;
unsigned long base = dma->dma_base;
{
dma_t *dma = (dma_t *)dev_id;
unsigned long base = dma->dma_base;
@@
-128,7
+128,7
@@
static irqreturn_t iomd_dma_handle(int irq, void *dev_id, struct pt_regs *regs)
static int iomd_request_dma(dmach_t channel, dma_t *dma)
{
return request_irq(dma->dma_irq, iomd_dma_handle,
static int iomd_request_dma(dmach_t channel, dma_t *dma)
{
return request_irq(dma->dma_irq, iomd_dma_handle,
-
SA_INTERRUPT
, dma->device_id, dma);
+
IRQF_DISABLED
, dma->device_id, dma);
}
static void iomd_free_dma(dmach_t channel, dma_t *dma)
}
static void iomd_free_dma(dmach_t channel, dma_t *dma)