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]
/
drivers
/
dma
/
ioatdma.c
diff --git
a/drivers/dma/ioatdma.c
b/drivers/dma/ioatdma.c
index
dbd4d6c
..
8e87261
100644
(file)
--- a/
drivers/dma/ioatdma.c
+++ b/
drivers/dma/ioatdma.c
@@
-80,7
+80,7
@@
static int enumerate_dma_channels(struct ioat_device *device)
static struct ioat_desc_sw *ioat_dma_alloc_descriptor(
struct ioat_dma_chan *ioat_chan,
static struct ioat_desc_sw *ioat_dma_alloc_descriptor(
struct ioat_dma_chan *ioat_chan,
-
in
t flags)
+
gfp_
t flags)
{
struct ioat_dma_descriptor *desc;
struct ioat_desc_sw *desc_sw;
{
struct ioat_dma_descriptor *desc;
struct ioat_desc_sw *desc_sw;
@@
-563,7
+563,7
@@
static struct pci_driver ioat_pci_drv = {
.remove = __devexit_p(ioat_remove),
};
.remove = __devexit_p(ioat_remove),
};
-static irqreturn_t ioat_do_interrupt(int irq, void *data
, struct pt_regs *regs
)
+static irqreturn_t ioat_do_interrupt(int irq, void *data)
{
struct ioat_device *instance = data;
unsigned long attnstatus;
{
struct ioat_device *instance = data;
unsigned long attnstatus;
@@
-636,10
+636,10
@@
static int ioat_self_test(struct ioat_device *device)
dma_cookie_t cookie;
int err = 0;
dma_cookie_t cookie;
int err = 0;
- src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE,
SLAB
_KERNEL);
+ src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE,
GFP
_KERNEL);
if (!src)
return -ENOMEM;
if (!src)
return -ENOMEM;
- dest = kzalloc(sizeof(u8) * IOAT_TEST_SIZE,
SLAB
_KERNEL);
+ dest = kzalloc(sizeof(u8) * IOAT_TEST_SIZE,
GFP
_KERNEL);
if (!dest) {
kfree(src);
return -ENOMEM;
if (!dest) {
kfree(src);
return -ENOMEM;
@@
-686,7
+686,7
@@
static int __devinit ioat_probe(struct pci_dev *pdev,
{
int err;
unsigned long mmio_start, mmio_len;
{
int err;
unsigned long mmio_start, mmio_len;
- void *reg_base;
+ void
__iomem
*reg_base;
struct ioat_device *device;
err = pci_enable_device(pdev);
struct ioat_device *device;
err = pci_enable_device(pdev);