8 files changed, 25 insertions, 20 deletions

diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index a7c4990b5b6b..31d08b641f5b 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -199,7 +199,7 @@ static int __init applicom_init(void)
                 if (pci_enable_device(dev))
                         return -EIO;
 
-                RamIO = ioremap(pci_resource_start(dev, 0), LEN_RAM_IO);
+                RamIO = ioremap_nocache(pci_resource_start(dev, 0), LEN_RAM_IO);
 
                 if (!RamIO) {
                         printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "
@@ -254,7 +254,7 @@ static int __init applicom_init(void)
         /* Now try the specified ISA cards */
 
         for (i = 0; i < MAX_ISA_BOARD; i++) {
-                RamIO = ioremap(mem + (LEN_RAM_IO * i), LEN_RAM_IO);
+                RamIO = ioremap_nocache(mem + (LEN_RAM_IO * i), LEN_RAM_IO);
 
                 if (!RamIO) {
                         printk(KERN_INFO "ac.o: Failed to ioremap the ISA card's memory space (slot #%d)\n", i + 1);
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index a1427d39d933..7c8b62f162bf 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -3257,7 +3257,7 @@ static int stli_initecp(struct stlibrd *brdp)
  */
         EBRDINIT(brdp);
 
-        brdp->membase = ioremap(brdp->memaddr, brdp->memsize);
+        brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
         if (brdp->membase == NULL) {
                 retval = -ENOMEM;
                 goto err_reg;
@@ -3414,7 +3414,7 @@ static int stli_initonb(struct stlibrd *brdp)
  */
         EBRDINIT(brdp);
 
-        brdp->membase = ioremap(brdp->memaddr, brdp->memsize);
+        brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
         if (brdp->membase == NULL) {
                 retval = -ENOMEM;
                 goto err_reg;
@@ -3665,7 +3665,7 @@ static int stli_eisamemprobe(struct stlibrd *brdp)
  */
         for (i = 0; (i < stli_eisamempsize); i++) {
                 brdp->memaddr = stli_eisamemprobeaddrs[i];
-                brdp->membase = ioremap(brdp->memaddr, brdp->memsize);
+                brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
                 if (brdp->membase == NULL)
                         continue;
 
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 585fac179ec6..d57d3a61919b 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -937,7 +937,7 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
                 goto err;
         }
 
-        board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000);
+        board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);
         if (board->basemem == NULL) {
                 dev_err(&pdev->dev, "can't remap io space 2\n");
                 goto err_reg;
@@ -1042,7 +1042,7 @@ static int __init moxa_init(void)
                         brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :
                                         numports[i];
                         brd->busType = MOXA_BUS_TYPE_ISA;
-                        brd->basemem = ioremap(baseaddr[i], 0x4000);
+                        brd->basemem = ioremap_nocache(baseaddr[i], 0x4000);
                         if (!brd->basemem) {
                                 printk(KERN_ERR "MOXA: can't remap %lx\n",
                                                 baseaddr[i]);
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index b55c933d5585..0a8d321e6e23 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1407,7 +1407,7 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev,
         /* Find out what card type it is */
         nozomi_get_card_type(dc);
 
-        dc->base_addr = ioremap(start, dc->card_type);
+        dc->base_addr = ioremap_nocache(start, dc->card_type);
         if (!dc->base_addr) {
                 dev_err(&pdev->dev, "Unable to map card MMIO\n");
                 ret = -ENODEV;
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index e97a21db3d48..4ad2c71b45f3 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2540,7 +2540,7 @@ static int __devinit sx_eisa_probe(struct device *dev)
                 goto err_flag;
         }
         board->base2 =
-        board->base = ioremap(board->hw_base, SI2_EISA_WINDOW_LEN);
+        board->base = ioremap_nocache(board->hw_base, SI2_EISA_WINDOW_LEN);
         if (!board->base) {
                 dev_err(dev, "can't remap memory\n");
                 goto err_reg;
@@ -2617,7 +2617,7 @@ static void __devinit fix_sx_pci(struct pci_dev *pdev, struct sx_board *board)
 
         pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase);
         hwbase &= PCI_BASE_ADDRESS_MEM_MASK;
-        rebase = ioremap(hwbase, 0x80);
+        rebase = ioremap_nocache(hwbase, 0x80);
         t = readl(rebase + CNTRL_REG_OFFSET);
         if (t != CNTRL_REG_GOODVALUE) {
                 printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> "
@@ -2761,7 +2761,7 @@ static int __init sx_init(void)
                 if (!request_region(board->hw_base, board->hw_len, "sx"))
                         continue;
                 board->base2 =
-                board->base = ioremap(board->hw_base, board->hw_len);
+                board->base = ioremap_nocache(board->hw_base, board->hw_len);
                 if (!board->base)
                         goto err_sx_reg;
                 board->flags &= ~SX_BOARD_TYPE;
@@ -2785,7 +2785,7 @@ err_sx_reg:
                 if (!request_region(board->hw_base, board->hw_len, "sx"))
                         continue;
                 board->base2 =
-                board->base = ioremap(board->hw_base, board->hw_len);
+                board->base = ioremap_nocache(board->hw_base, board->hw_len);
                 if (!board->base)
                         goto err_si_reg;
                 board->flags &= ~SX_BOARD_TYPE;
@@ -2808,7 +2808,7 @@ err_si_reg:
                 if (!request_region(board->hw_base, board->hw_len, "sx"))
                         continue;
                 board->base2 =
-                board->base = ioremap(board->hw_base, board->hw_len);
+                board->base = ioremap_nocache(board->hw_base, board->hw_len);
                 if (!board->base)
                         goto err_si1_reg;
                 board->flags &= ~SX_BOARD_TYPE;
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 4fbfff7a442e..513b7c2f3e26 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -4150,7 +4150,8 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                 }
                 info->lcr_mem_requested = true;
 
-                info->memory_base = ioremap(info->phys_memory_base,0x40000);
+                info->memory_base = ioremap_nocache(info->phys_memory_base,
+                                                                0x40000);
                 if (!info->memory_base) {
                         printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n",
                                 __FILE__,__LINE__,info->device_name, info->phys_memory_base );
@@ -4163,12 +4164,14 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
                         goto errout;
                 }
                 
-                info->lcr_base = ioremap(info->phys_lcr_base,PAGE_SIZE) + info->lcr_offset;
+                info->lcr_base = ioremap_nocache(info->phys_lcr_base,
+                                                                PAGE_SIZE);
                 if (!info->lcr_base) {
                         printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n",
                                 __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
                         goto errout;
                 }
+                info->lcr_base += info->lcr_offset;
                 
         } else {
                 /* claim DMA channel */
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 430f5bc0ae30..2001b0e52dc6 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -3350,7 +3350,7 @@ static int claim_resources(struct slgt_info *info)
         else
                 info->reg_addr_requested = true;
 
-        info->reg_addr = ioremap(info->phys_reg_addr, SLGT_REG_SIZE);
+        info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE);
         if (!info->reg_addr) {
                 DBGERR(("%s cant map device registers, addr=%08X\n",
                         info->device_name, info->phys_reg_addr));
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index a624ffd7baaa..bec54866e0bb 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -3643,7 +3643,8 @@ static int claim_resources(SLMP_INFO *info)
         else
                 info->sca_statctrl_requested = true;
 
-        info->memory_base = ioremap(info->phys_memory_base,SCA_MEM_SIZE);
+        info->memory_base = ioremap_nocache(info->phys_memory_base,
+                                                                SCA_MEM_SIZE);
         if (!info->memory_base) {
                 printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n",
                         __FILE__,__LINE__,info->device_name, info->phys_memory_base );
@@ -3651,7 +3652,7 @@ static int claim_resources(SLMP_INFO *info)
                 goto errout;
         }
 
-        info->lcr_base = ioremap(info->phys_lcr_base,PAGE_SIZE);
+        info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE);
         if (!info->lcr_base) {
                 printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n",
                         __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
@@ -3660,7 +3661,7 @@ static int claim_resources(SLMP_INFO *info)
         }
         info->lcr_base += info->lcr_offset;
 
-        info->sca_base = ioremap(info->phys_sca_base,PAGE_SIZE);
+        info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE);
         if (!info->sca_base) {
                 printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n",
                         __FILE__,__LINE__,info->device_name, info->phys_sca_base );
@@ -3669,7 +3670,8 @@ static int claim_resources(SLMP_INFO *info)
         }
         info->sca_base += info->sca_offset;
 
-        info->statctrl_base = ioremap(info->phys_statctrl_base,PAGE_SIZE);
+        info->statctrl_base = ioremap_nocache(info->phys_statctrl_base,
+                                                                PAGE_SIZE);
         if (!info->statctrl_base) {
                 printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n",
                         __FILE__,__LINE__,info->device_name, info->phys_statctrl_base );