2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index dbd4d6c3698e..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;
@@ -563,7 +563,7 @@ static struct pci_driver ioat_pci_drv = {
         .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;
@@ -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);
diff --git a/drivers/dma/ioatdma.h b/drivers/dma/ioatdma.h
index a5d3b3644160..62b26a9be4c9 100644
--- a/drivers/dma/ioatdma.h
+++ b/drivers/dma/ioatdma.h
@@ -44,7 +44,7 @@ extern struct list_head dma_client_list;
 
 struct ioat_device {
         struct pci_dev *pdev;
-        void *reg_base;
+        void __iomem *reg_base;
         struct pci_pool *dma_pool;
         struct pci_pool *completion_pool;
 
@@ -73,7 +73,7 @@ struct ioat_device {
 
 struct ioat_dma_chan {
 
-        void *reg_base;
+        void __iomem *reg_base;
 
         dma_cookie_t completed_cookie;
         unsigned long last_completion;