aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioatdma.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-10 22:45:47 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-10 15:37:21 -0700
commit47b16539e1072afd2c964b97be4a95b5cf2ff801 (patch)
tree6acd1d1a667f5b724cdc5c95f0bbed2639a24b55 /drivers/dma/ioatdma.c
parent[PATCH] devio __user annotations (diff)
downloadlinux-dev-47b16539e1072afd2c964b97be4a95b5cf2ff801.tar.xz
linux-dev-47b16539e1072afd2c964b97be4a95b5cf2ff801.zip
[PATCH] drivers/dma trivial annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/dma/ioatdma.c')
-rw-r--r--drivers/dma/ioatdma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index f3bf1e230bca..0358419a0e48 100644
--- 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,
- int flags)
+ gfp_t flags)
{
struct ioat_dma_descriptor *desc;
struct ioat_desc_sw *desc_sw;
@@ -686,7 +686,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
{
int err;
unsigned long mmio_start, mmio_len;
- void *reg_base;
+ void __iomem *reg_base;
struct ioat_device *device;
err = pci_enable_device(pdev);