19 files changed, 163 insertions, 145 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 081e3dfb64d4..7ef515b3382d 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4689,6 +4689,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
                  * data in this function or read data in ata_sg_clean.
                  */
                 offset = lsg->offset + lsg->length - qc->pad_len;
+                sg_init_table(psg, 1);
                 sg_set_page(psg, nth_page(sg_page(lsg), offset >> PAGE_SHIFT),
                                 qc->pad_len, offset_in_page(offset));
 
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 0e937f64a789..20070b7c573d 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -41,7 +41,7 @@
  */
 static inline int uncached_access(struct file *file, unsigned long addr)
 {
-#if defined(__i386__)
+#if defined(__i386__) && !defined(__arch_um__)
         /*
          * On the PPro and successors, the MTRRs are used to set
          * memory types for physical addresses outside main memory,
@@ -57,7 +57,7 @@ static inline int uncached_access(struct file *file, unsigned long addr)
                   test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability) ||
                   test_bit(X86_FEATURE_CENTAUR_MCR, boot_cpu_data.x86_capability) )
           && addr >= __pa(high_memory);
-#elif defined(__x86_64__)
+#elif defined(__x86_64__) && !defined(__arch_um__)
         /* 
          * This is broken because it can generate memory type aliases,
          * which can cause cache corruptions
diff --git a/drivers/md/raid6algos.c b/drivers/md/raid6algos.c
index 926576156578..77a6e4bf503d 100644
--- a/drivers/md/raid6algos.c
+++ b/drivers/md/raid6algos.c
@@ -52,7 +52,7 @@ const struct raid6_calls * const raid6_algos[] = {
         &raid6_intx16,
         &raid6_intx32,
 #endif
-#if defined(__i386__)
+#if defined(__i386__) && !defined(__arch_um__)
         &raid6_mmxx1,
         &raid6_mmxx2,
         &raid6_sse1x1,
@@ -60,7 +60,7 @@ const struct raid6_calls * const raid6_algos[] = {
         &raid6_sse2x1,
         &raid6_sse2x2,
 #endif
-#if defined(__x86_64__)
+#if defined(__x86_64__) && !defined(__arch_um__)
         &raid6_sse2x1,
         &raid6_sse2x2,
         &raid6_sse2x4,
diff --git a/drivers/md/raid6mmx.c b/drivers/md/raid6mmx.c
index 6181a5a3365a..d4e4a1bd70ad 100644
--- a/drivers/md/raid6mmx.c
+++ b/drivers/md/raid6mmx.c
@@ -16,7 +16,7 @@
  * MMX implementation of RAID-6 syndrome functions
  */
 
-#if defined(__i386__)
+#if defined(__i386__) && !defined(__arch_um__)
 
 #include "raid6.h"
 #include "raid6x86.h"
diff --git a/drivers/md/raid6sse1.c b/drivers/md/raid6sse1.c
index f0a1ba8f40ba..0666237276ff 100644
--- a/drivers/md/raid6sse1.c
+++ b/drivers/md/raid6sse1.c
@@ -21,7 +21,7 @@
  * worthwhile as a separate implementation.
  */
 
-#if defined(__i386__)
+#if defined(__i386__) && !defined(__arch_um__)
 
 #include "raid6.h"
 #include "raid6x86.h"
diff --git a/drivers/md/raid6sse2.c b/drivers/md/raid6sse2.c
index 0f019762a7c3..b034ad868039 100644
--- a/drivers/md/raid6sse2.c
+++ b/drivers/md/raid6sse2.c
@@ -17,7 +17,7 @@
  *
  */
 
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__)
 
 #include "raid6.h"
 #include "raid6x86.h"
@@ -161,7 +161,7 @@ const struct raid6_calls raid6_sse2x2 = {
 
 #endif
 
-#ifdef __x86_64__
+#if defined(__x86_64__) && !defined(__arch_um__)
 
 /*
  * Unrolled-by-4 SSE2 implementation
diff --git a/drivers/md/raid6x86.h b/drivers/md/raid6x86.h
index 9111950414ff..99fea7a70ca7 100644
--- a/drivers/md/raid6x86.h
+++ b/drivers/md/raid6x86.h
@@ -19,7 +19,7 @@
 #ifndef LINUX_RAID_RAID6X86_H
 #define LINUX_RAID_RAID6X86_H
 
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__)
 
 #ifdef __KERNEL__ /* Real code */
 
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index fc72e1fadb6a..f2070a19cfa7 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -262,7 +262,7 @@ static void imxmci_setup_data(struct imxmci_host *host, struct mmc_data *data)
                 }
 
                 /* Convert back to virtual address */
-                host->data_ptr = (u16*)sg_virt(sg);
+                host->data_ptr = (u16*)sg_virt(data->sg);
                 host->data_cnt = 0;
 
                 clear_bit(IMXMCI_PEND_DMA_DATA_b, &host->pending_events);
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 0c4ab3b07274..9b35259eecfa 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -745,7 +745,7 @@ static char *fault_reason_strings[] =
         "non-zero reserved fields in PTE",
         "Unknown"
 };
-#define MAX_FAULT_REASON_IDX    ARRAY_SIZE(fault_reason_strings)
+#define MAX_FAULT_REASON_IDX    ARRAY_SIZE(fault_reason_strings) - 1
 
 char *dmar_get_fault_reason(u8 fault_reason)
 {
@@ -995,7 +995,6 @@ static struct intel_iommu *alloc_iommu(struct dmar_drhd_unit *drhd)
         return iommu;
 error_unmap:
         iounmap(iommu->reg);
-        iommu->reg = 0;
 error:
         kfree(iommu);
         return NULL;
@@ -1808,7 +1807,7 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
         if (!domain) {
                 printk(KERN_ERR
                         "Allocating domain for %s failed", pci_name(pdev));
-                return 0;
+                return NULL;
         }
 
         /* make sure context mapping is ok */
@@ -1818,7 +1817,7 @@ get_valid_domain_for_dev(struct pci_dev *pdev)
                         printk(KERN_ERR
                                 "Domain context map for %s failed",
                                 pci_name(pdev));
-                        return 0;
+                        return NULL;
                 }
         }
 
diff --git a/drivers/pci/intel-iommu.h b/drivers/pci/intel-iommu.h
index ee88dd2400cb..459ad1f9dc54 100644
--- a/drivers/pci/intel-iommu.h
+++ b/drivers/pci/intel-iommu.h
@@ -58,7 +58,7 @@
                 hi = readl(dmar + reg + 4); \
                 (((u64) hi) << 32) + lo; })
 */
-static inline u64 dmar_readq(void *addr)
+static inline u64 dmar_readq(void __iomem *addr)
 {
         u32 lo, hi;
         lo = readl(addr);
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 0754542978b6..e268f79bdbd2 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -70,11 +70,12 @@ zfcp_sg_to_address(struct scatterlist *list)
  * zfcp_address_to_sg - set up struct scatterlist from kernel address
  * @address: kernel address
  * @list: struct scatterlist
+ * @size: buffer size
  */
 static inline void
-zfcp_address_to_sg(void *address, struct scatterlist *list)
+zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size)
 {
-        sg_set_buf(list, address, 0);
+        sg_set_buf(list, address, size);
 }
 
 #define REQUEST_LIST_SIZE 128
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 72b0393b4596..1e6d7a9c75bf 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -391,7 +391,7 @@ static int close_getadapter_fib(struct aac_dev * dev, void __user *arg)
                 /*
                  *      Extract the fibctx from the input parameters
                  */
-                if (fibctx->unique == (u32)(ptrdiff_t)arg) /* We found a winner */
+                if (fibctx->unique == (u32)(uintptr_t)arg) /* We found a winner */
                         break;
                 entry = entry->next;
                 fibctx = NULL;
@@ -590,7 +590,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                 }
                                 addr = (u64)upsg->sg[i].addr[0];
                                 addr += ((u64)upsg->sg[i].addr[1]) << 32;
-                                sg_user[i] = (void __user *)(ptrdiff_t)addr;
+                                sg_user[i] = (void __user *)(uintptr_t)addr;
                                 sg_list[i] = p; // save so we can clean up later
                                 sg_indx = i;
 
@@ -633,7 +633,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                         rcode = -ENOMEM;
                                         goto cleanup;
                                 }
-                                sg_user[i] = (void __user *)(ptrdiff_t)usg->sg[i].addr;
+                                sg_user[i] = (void __user *)(uintptr_t)usg->sg[i].addr;
                                 sg_list[i] = p; // save so we can clean up later
                                 sg_indx = i;
 
@@ -664,7 +664,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                 if (actual_fibsize64 == fibsize) {
                         struct user_sgmap64* usg = (struct user_sgmap64 *)upsg;
                         for (i = 0; i < upsg->count; i++) {
-                                u64 addr;
+                                uintptr_t addr;
                                 void* p;
                                 /* Does this really need to be GFP_DMA? */
                                 p = kmalloc(usg->sg[i].count,GFP_KERNEL|__GFP_DMA);
@@ -676,7 +676,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                 }
                                 addr = (u64)usg->sg[i].addr[0];
                                 addr += ((u64)usg->sg[i].addr[1]) << 32;
-                                sg_user[i] = (void __user *)(ptrdiff_t)addr;
+                                sg_user[i] = (void __user *)addr;
                                 sg_list[i] = p; // save so we can clean up later
                                 sg_indx = i;
 
@@ -704,7 +704,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                         rcode = -ENOMEM;
                                         goto cleanup;
                                 }
-                                sg_user[i] = (void __user *)(ptrdiff_t)upsg->sg[i].addr;
+                                sg_user[i] = (void __user *)(uintptr_t)upsg->sg[i].addr;
                                 sg_list[i] = p; // save so we can clean up later
                                 sg_indx = i;
 
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 3009ad8c4073..8736813a0296 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -110,7 +110,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
         /*
          *      Align the beginning of Headers to commalign
          */
-        align = (commalign - ((ptrdiff_t)(base) & (commalign - 1)));
+        align = (commalign - ((uintptr_t)(base) & (commalign - 1)));
         base = base + align;
         phys = phys + align;
         /*
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index fcd25f7d0bc6..e6032ffc66a6 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -254,7 +254,7 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
                         kfree (fib);
                         return 1;
                 }
-                memcpy(hw_fib, (struct hw_fib *)(((ptrdiff_t)(dev->regs.sa)) +
+                memcpy(hw_fib, (struct hw_fib *)(((uintptr_t)(dev->regs.sa)) +
                   (index & ~0x00000002L)), sizeof(struct hw_fib));
                 INIT_LIST_HEAD(&fib->fiblink);
                 fib->type = FSAFS_NTC_FIB_CONTEXT;
diff --git a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
index ace7a15b413e..a67e29f83ae5 100644
--- a/drivers/scsi/arcmsr/arcmsr.h
+++ b/drivers/scsi/arcmsr/arcmsr.h
@@ -141,14 +141,14 @@ struct CMD_MESSAGE_FIELD
 #define IS_SG64_ADDR                0x01000000 /* bit24 */
 struct  SG32ENTRY
 {
-        uint32_t                                        length;
-        uint32_t                                        address;
+        __le32                                  length;
+        __le32                                  address;
 };
 struct  SG64ENTRY
 {
-        uint32_t                                        length;
-        uint32_t                                        address;
-        uint32_t                                        addresshigh;
+        __le32                                  length;
+        __le32                                  address;
+        __le32                                  addresshigh;
 };
 struct SGENTRY_UNION
 {
@@ -339,23 +339,15 @@ struct MessageUnit_B
         uint32_t        done_qbuffer[ARCMSR_MAX_HBB_POSTQUEUE];
         uint32_t        postq_index;
         uint32_t        doneq_index;
-        uint32_t        *drv2iop_doorbell_reg;
-        uint32_t        *drv2iop_doorbell_mask_reg;
-        uint32_t        *iop2drv_doorbell_reg;
-        uint32_t        *iop2drv_doorbell_mask_reg;
-        uint32_t        *msgcode_rwbuffer_reg;
-        uint32_t        *ioctl_wbuffer_reg;
-        uint32_t        *ioctl_rbuffer_reg;
+        uint32_t        __iomem *drv2iop_doorbell_reg;
+        uint32_t        __iomem *drv2iop_doorbell_mask_reg;
+        uint32_t        __iomem *iop2drv_doorbell_reg;
+        uint32_t        __iomem *iop2drv_doorbell_mask_reg;
+        uint32_t        __iomem *msgcode_rwbuffer_reg;
+        uint32_t        __iomem *ioctl_wbuffer_reg;
+        uint32_t        __iomem *ioctl_rbuffer_reg;
 };
 
-struct MessageUnit
-{
-        union
-        {
-                struct MessageUnit_A    pmu_A;
-                struct MessageUnit_B    pmu_B;
-        } u;
-};
 /*
 *******************************************************************************
 **                 Adapter Control Block
@@ -374,7 +366,10 @@ struct AdapterControlBlock
         /* Offset is used in making arc cdb physical to virtual calculations */
         uint32_t                        outbound_int_enable;
 
-        struct MessageUnit *                    pmu;
+        union {
+                struct MessageUnit_A __iomem *  pmuA;
+                struct MessageUnit_B *          pmuB;
+        };
         /* message unit ATU inbound base address0 */
 
         uint32_t                        acb_flags;
@@ -558,7 +553,7 @@ struct SENSE_DATA
 
 extern void arcmsr_post_ioctldata2iop(struct AdapterControlBlock *);
 extern void arcmsr_iop_message_read(struct AdapterControlBlock *);
-extern struct QBUFFER *arcmsr_get_iop_rqbuffer(struct AdapterControlBlock *);
+extern struct QBUFFER __iomem *arcmsr_get_iop_rqbuffer(struct AdapterControlBlock *);
 extern struct class_device_attribute *arcmsr_host_attrs[];
 extern int arcmsr_alloc_sysfs_attr(struct AdapterControlBlock *);
 void arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb);
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index d04d1aa28fa4..7d7b0a554276 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -85,13 +85,13 @@ static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj,
                 allxfer_len++;
         }
         if (acb->acb_flags & ACB_F_IOPDATA_OVERFLOW) {
-                struct QBUFFER *prbuffer;
-                uint8_t *iop_data;
+                struct QBUFFER __iomem *prbuffer;
+                uint8_t __iomem *iop_data;
                 int32_t iop_len;
 
                 acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW;
                 prbuffer = arcmsr_get_iop_rqbuffer(acb);
-                iop_data = (uint8_t *)prbuffer->data;
+                iop_data = prbuffer->data;
                 iop_len = readl(&prbuffer->data_len);
                 while (iop_len > 0) {
                         acb->rqbuffer[acb->rqbuf_lastindex] = readb(iop_data);
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index f7a252885a5c..d466a2dac1db 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -236,18 +236,22 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb)
                 uint32_t intmask_org;
                 int i, j;
 
-                acb->pmu = ioremap(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));
-                if (!acb->pmu) {
+                acb->pmuA = ioremap(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));
+                if (!acb->pmuA) {
                         printk(KERN_NOTICE "arcmsr%d: memory mapping region fail \n",
                                                         acb->host->host_no);
+                        return -ENOMEM;
                 }
 
                 dma_coherent = dma_alloc_coherent(&pdev->dev,
                         ARCMSR_MAX_FREECCB_NUM *
                         sizeof (struct CommandControlBlock) + 0x20,
                         &dma_coherent_handle, GFP_KERNEL);
-                if (!dma_coherent)
+
+                if (!dma_coherent) {
+                        iounmap(acb->pmuA);
                         return -ENOMEM;
+                }
 
                 acb->dma_coherent = dma_coherent;
                 acb->dma_coherent_handle = dma_coherent_handle;
@@ -287,7 +291,7 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb)
 
                 struct pci_dev *pdev = acb->pdev;
                 struct MessageUnit_B *reg;
-                void *mem_base0, *mem_base1;
+                void __iomem *mem_base0, *mem_base1;
                 void *dma_coherent;
                 dma_addr_t dma_coherent_handle, dma_addr;
                 uint32_t intmask_org;
@@ -328,25 +332,28 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb)
 
                 reg = (struct MessageUnit_B *)(dma_coherent +
                 ARCMSR_MAX_FREECCB_NUM * sizeof(struct CommandControlBlock));
-                acb->pmu = (struct MessageUnit *)reg;
+                acb->pmuB = reg;
                 mem_base0 = ioremap(pci_resource_start(pdev, 0),
                                         pci_resource_len(pdev, 0));
+                if (!mem_base0)
+                        goto out;
+
                 mem_base1 = ioremap(pci_resource_start(pdev, 2),
                                         pci_resource_len(pdev, 2));
-                reg->drv2iop_doorbell_reg = (uint32_t *)((char *)mem_base0 +
-                                                ARCMSR_DRV2IOP_DOORBELL);
-                reg->drv2iop_doorbell_mask_reg = (uint32_t *)((char *)mem_base0 +
-                                                ARCMSR_DRV2IOP_DOORBELL_MASK);
-                reg->iop2drv_doorbell_reg = (uint32_t *)((char *)mem_base0 +
-                                                        ARCMSR_IOP2DRV_DOORBELL);
-                reg->iop2drv_doorbell_mask_reg = (uint32_t *)((char *)mem_base0 +
-                                                ARCMSR_IOP2DRV_DOORBELL_MASK);
-                reg->ioctl_wbuffer_reg = (uint32_t *)((char *)mem_base1 +
-                                                        ARCMSR_IOCTL_WBUFFER);
-                reg->ioctl_rbuffer_reg = (uint32_t *)((char *)mem_base1 +
-                                                        ARCMSR_IOCTL_RBUFFER);
-                reg->msgcode_rwbuffer_reg = (uint32_t *)((char *)mem_base1 +
-                                                        ARCMSR_MSGCODE_RWBUFFER);
+                if (!mem_base1) {
+                        iounmap(mem_base0);
+                        goto out;
+                }
+
+                reg->drv2iop_doorbell_reg = mem_base0 + ARCMSR_DRV2IOP_DOORBELL;
+                reg->drv2iop_doorbell_mask_reg = mem_base0 +
+                                                ARCMSR_DRV2IOP_DOORBELL_MASK;
+                reg->iop2drv_doorbell_reg = mem_base0 + ARCMSR_IOP2DRV_DOORBELL;
+                reg->iop2drv_doorbell_mask_reg = mem_base0 +
+                                                ARCMSR_IOP2DRV_DOORBELL_MASK;
+                reg->ioctl_wbuffer_reg = mem_base1 + ARCMSR_IOCTL_WBUFFER;
+                reg->ioctl_rbuffer_reg = mem_base1 + ARCMSR_IOCTL_RBUFFER;
+                reg->msgcode_rwbuffer_reg = mem_base1 + ARCMSR_MSGCODE_RWBUFFER;
 
                 acb->vir2phy_offset = (unsigned long)ccb_tmp -(unsigned long)dma_addr;
                 for (i = 0; i < ARCMSR_MAX_TARGETID; i++)
@@ -362,6 +369,12 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb)
                 break;
         }
         return 0;
+
+out:
+        dma_free_coherent(&acb->pdev->dev,
+                ARCMSR_MAX_FREECCB_NUM * sizeof(struct CommandControlBlock) + 0x20,
+                acb->dma_coherent, acb->dma_coherent_handle);
+        return -ENOMEM;
 }
 
 static int arcmsr_probe(struct pci_dev *pdev,
@@ -454,7 +467,6 @@ static int arcmsr_probe(struct pci_dev *pdev,
         free_irq(pdev->irq, acb);
  out_free_ccb_pool:
         arcmsr_free_ccb_pool(acb);
-        iounmap(acb->pmu);
  out_release_regions:
         pci_release_regions(pdev);
  out_host_put:
@@ -467,7 +479,7 @@ static int arcmsr_probe(struct pci_dev *pdev,
 
 static uint8_t arcmsr_hba_wait_msgint_ready(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
         uint32_t Index;
         uint8_t Retries = 0x00;
 
@@ -488,7 +500,7 @@ static uint8_t arcmsr_hba_wait_msgint_ready(struct AdapterControlBlock *acb)
 
 static uint8_t arcmsr_hbb_wait_msgint_ready(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+        struct MessageUnit_B *reg = acb->pmuB;
         uint32_t Index;
         uint8_t Retries = 0x00;
 
@@ -509,7 +521,7 @@ static uint8_t arcmsr_hbb_wait_msgint_ready(struct AdapterControlBlock *acb)
 
 static void arcmsr_abort_hba_allcmd(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
 
         writel(ARCMSR_INBOUND_MESG0_ABORT_CMD, &reg->inbound_msgaddr0);
         if (arcmsr_hba_wait_msgint_ready(acb))
@@ -520,7 +532,7 @@ static void arcmsr_abort_hba_allcmd(struct AdapterControlBlock *acb)
 
 static void arcmsr_abort_hbb_allcmd(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+        struct MessageUnit_B *reg = acb->pmuB;
 
         writel(ARCMSR_MESSAGE_ABORT_CMD, reg->drv2iop_doorbell_reg);
         if (arcmsr_hbb_wait_msgint_ready(acb))
@@ -566,7 +578,7 @@ static void arcmsr_ccb_complete(struct CommandControlBlock *ccb, int stand_flag)
 
 static void arcmsr_flush_hba_cache(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
         int retry_count = 30;
 
         writel(ARCMSR_INBOUND_MESG0_FLUSH_CACHE, &reg->inbound_msgaddr0);
@@ -583,7 +595,7 @@ static void arcmsr_flush_hba_cache(struct AdapterControlBlock *acb)
 
 static void arcmsr_flush_hbb_cache(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+        struct MessageUnit_B *reg = acb->pmuB;
         int retry_count = 30;
 
         writel(ARCMSR_MESSAGE_FLUSH_CACHE, reg->drv2iop_doorbell_reg);
@@ -637,7 +649,7 @@ static u32 arcmsr_disable_outbound_ints(struct AdapterControlBlock *acb)
         switch (acb->adapter_type) {
 
         case ACB_ADAPTER_TYPE_A : {
-                struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
                 orig_mask = readl(&reg->outbound_intmask)|\
                                 ARCMSR_MU_OUTBOUND_MESSAGE0_INTMASKENABLE;
                 writel(orig_mask|ARCMSR_MU_OUTBOUND_ALL_INTMASKENABLE, \
@@ -646,7 +658,7 @@ static u32 arcmsr_disable_outbound_ints(struct AdapterControlBlock *acb)
                 break;
 
         case ACB_ADAPTER_TYPE_B : {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 orig_mask = readl(reg->iop2drv_doorbell_mask_reg) & \
                                         (~ARCMSR_IOP2DRV_MESSAGE_CMD_DONE);
                 writel(0, reg->iop2drv_doorbell_mask_reg);
@@ -748,14 +760,13 @@ static void arcmsr_done4abort_postqueue(struct AdapterControlBlock *acb)
         switch (acb->adapter_type) {
 
         case ACB_ADAPTER_TYPE_A: {
-                struct MessageUnit_A __iomem *reg = \
-                        (struct MessageUnit_A *)acb->pmu;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
                 uint32_t outbound_intstatus;
-                outbound_intstatus = readl(&reg->outbound_intstatus) & \
+                outbound_intstatus = readl(&reg->outbound_intstatus) &
                                         acb->outbound_int_enable;
                 /*clear and abort all outbound posted Q*/
                 writel(outbound_intstatus, &reg->outbound_intstatus);/*clear interrupt*/
-                while (((flag_ccb = readl(&reg->outbound_queueport)) != 0xFFFFFFFF) \
+                while (((flag_ccb = readl(&reg->outbound_queueport)) != 0xFFFFFFFF)
                                 && (i++ < ARCMSR_MAX_OUTSTANDING_CMD)) {
                         arcmsr_drain_donequeue(acb, flag_ccb);
                 }
@@ -763,7 +774,7 @@ static void arcmsr_done4abort_postqueue(struct AdapterControlBlock *acb)
                 break;
 
         case ACB_ADAPTER_TYPE_B: {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 /*clear all outbound posted Q*/
                 for (i = 0; i < ARCMSR_MAX_HBB_POSTQUEUE; i++) {
                         if ((flag_ccb = readl(&reg->done_qbuffer[i])) != 0) {
@@ -816,7 +827,6 @@ static void arcmsr_remove(struct pci_dev *pdev)
         }
 
         free_irq(pdev->irq, acb);
-        iounmap(acb->pmu);
         arcmsr_free_ccb_pool(acb);
         pci_release_regions(pdev);
 
@@ -859,7 +869,7 @@ static void arcmsr_enable_outbound_ints(struct AdapterControlBlock *acb, \
         switch (acb->adapter_type) {
 
         case ACB_ADAPTER_TYPE_A : {
-                struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
                 mask = intmask_org & ~(ARCMSR_MU_OUTBOUND_POSTQUEUE_INTMASKENABLE |
                              ARCMSR_MU_OUTBOUND_DOORBELL_INTMASKENABLE);
                 writel(mask, &reg->outbound_intmask);
@@ -868,7 +878,7 @@ static void arcmsr_enable_outbound_ints(struct AdapterControlBlock *acb, \
                 break;
 
         case ACB_ADAPTER_TYPE_B : {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 mask = intmask_org | (ARCMSR_IOP2DRV_DATA_WRITE_OK | \
                         ARCMSR_IOP2DRV_DATA_READ_OK | ARCMSR_IOP2DRV_CDB_DONE);
                 writel(mask, reg->iop2drv_doorbell_mask_reg);
@@ -882,7 +892,7 @@ static void arcmsr_build_ccb(struct AdapterControlBlock *acb,
 {
         struct ARCMSR_CDB *arcmsr_cdb = (struct ARCMSR_CDB *)&ccb->arcmsr_cdb;
         int8_t *psge = (int8_t *)&arcmsr_cdb->u;
-        uint32_t address_lo, address_hi;
+        __le32 address_lo, address_hi;
         int arccdbsize = 0x30;
         int nseg;
 
@@ -900,7 +910,8 @@ static void arcmsr_build_ccb(struct AdapterControlBlock *acb,
         BUG_ON(nseg < 0);
 
         if (nseg) {
-                int length, i, cdb_sgcount = 0;
+                __le32 length;
+                int i, cdb_sgcount = 0;
                 struct scatterlist *sg;
 
                 /* map stor port SG list to our iop SG List. */
@@ -921,7 +932,7 @@ static void arcmsr_build_ccb(struct AdapterControlBlock *acb,
 
                                 pdma_sg->addresshigh = address_hi;
                                 pdma_sg->address = address_lo;
-                                pdma_sg->length = length|IS_SG64_ADDR;
+                                pdma_sg->length = length|cpu_to_le32(IS_SG64_ADDR);
                                 psge += sizeof (struct SG64ENTRY);
                                 arccdbsize += sizeof (struct SG64ENTRY);
                         }
@@ -947,7 +958,7 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr
 
         switch (acb->adapter_type) {
         case ACB_ADAPTER_TYPE_A: {
-                struct MessageUnit_A *reg = (struct MessageUnit_A *)acb->pmu;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
 
                 if (arcmsr_cdb->Flags & ARCMSR_CDB_FLAG_SGL_BSIZE)
                         writel(cdb_shifted_phyaddr | ARCMSR_CCBPOST_FLAG_SGL_BSIZE,
@@ -959,7 +970,7 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr
                 break;
 
         case ACB_ADAPTER_TYPE_B: {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 uint32_t ending_index, index = reg->postq_index;
 
                 ending_index = ((index + 1) % ARCMSR_MAX_HBB_POSTQUEUE);
@@ -982,7 +993,7 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr
 
 static void arcmsr_stop_hba_bgrb(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
         acb->acb_flags &= ~ACB_F_MSG_START_BGRB;
         writel(ARCMSR_INBOUND_MESG0_STOP_BGRB, &reg->inbound_msgaddr0);
 
@@ -995,7 +1006,7 @@ static void arcmsr_stop_hba_bgrb(struct AdapterControlBlock *acb)
 
 static void arcmsr_stop_hbb_bgrb(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+        struct MessageUnit_B *reg = acb->pmuB;
         acb->acb_flags &= ~ACB_F_MSG_START_BGRB;
         writel(ARCMSR_MESSAGE_STOP_BGRB, reg->drv2iop_doorbell_reg);
 
@@ -1023,6 +1034,17 @@ static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb)
 
 static void arcmsr_free_ccb_pool(struct AdapterControlBlock *acb)
 {
+        switch (acb->adapter_type) {
+        case ACB_ADAPTER_TYPE_A: {
+                iounmap(acb->pmuA);
+                break;
+        }
+        case ACB_ADAPTER_TYPE_B: {
+                struct MessageUnit_B *reg = acb->pmuB;
+                iounmap(reg->drv2iop_doorbell_reg - ARCMSR_DRV2IOP_DOORBELL);
+                iounmap(reg->ioctl_wbuffer_reg - ARCMSR_IOCTL_WBUFFER);
+        }
+        }
         dma_free_coherent(&acb->pdev->dev,
                 ARCMSR_MAX_FREECCB_NUM * sizeof (struct CommandControlBlock) + 0x20,
                 acb->dma_coherent,
@@ -1033,13 +1055,13 @@ void arcmsr_iop_message_read(struct AdapterControlBlock *acb)
 {
         switch (acb->adapter_type) {
         case ACB_ADAPTER_TYPE_A: {
-                struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
                 writel(ARCMSR_INBOUND_DRIVER_DATA_READ_OK, &reg->inbound_doorbell);
                 }
                 break;
 
         case ACB_ADAPTER_TYPE_B: {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 writel(ARCMSR_DRV2IOP_DATA_READ_OK, reg->drv2iop_doorbell_reg);
                 }
                 break;
@@ -1050,7 +1072,7 @@ static void arcmsr_iop_message_wrote(struct AdapterControlBlock *acb)
 {
         switch (acb->adapter_type) {
         case ACB_ADAPTER_TYPE_A: {
-                struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
                 /*
                 ** push inbound doorbell tell iop, driver data write ok
                 ** and wait reply on next hwinterrupt for next Qbuffer post
@@ -1060,7 +1082,7 @@ static void arcmsr_iop_message_wrote(struct AdapterControlBlock *acb)
                 break;
 
         case ACB_ADAPTER_TYPE_B: {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 /*
                 ** push inbound doorbell tell iop, driver data write ok
                 ** and wait reply on next hwinterrupt for next Qbuffer post
@@ -1071,41 +1093,41 @@ static void arcmsr_iop_message_wrote(struct AdapterControlBlock *acb)
         }
 }
 
-struct QBUFFER *arcmsr_get_iop_rqbuffer(struct AdapterControlBlock *acb)
+struct QBUFFER __iomem *arcmsr_get_iop_rqbuffer(struct AdapterControlBlock *acb)
 {
-        static struct QBUFFER *qbuffer;
+        struct QBUFFER __iomem *qbuffer = NULL;
 
         switch (acb->adapter_type) {
 
         case ACB_ADAPTER_TYPE_A: {
-                struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
-                qbuffer = (struct QBUFFER __iomem *) &reg->message_rbuffer;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
+                qbuffer = (struct QBUFFER __iomem *)&reg->message_rbuffer;
                 }
                 break;
 
         case ACB_ADAPTER_TYPE_B: {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
-                qbuffer = (struct QBUFFER __iomem *) reg->ioctl_rbuffer_reg;
+                struct MessageUnit_B *reg = acb->pmuB;
+                qbuffer = (struct QBUFFER __iomem *)reg->ioctl_rbuffer_reg;
                 }
                 break;
         }
         return qbuffer;
 }
 
-static struct QBUFFER *arcmsr_get_iop_wqbuffer(struct AdapterControlBlock *acb)
+static struct QBUFFER __iomem *arcmsr_get_iop_wqbuffer(struct AdapterControlBlock *acb)
 {
-        static struct QBUFFER *pqbuffer;
+        struct QBUFFER __iomem *pqbuffer = NULL;
 
         switch (acb->adapter_type) {
 
         case ACB_ADAPTER_TYPE_A: {
-                struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
-                pqbuffer = (struct QBUFFER *) &reg->message_wbuffer;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
+                pqbuffer = (struct QBUFFER __iomem *) &reg->message_wbuffer;
                 }
                 break;
 
         case ACB_ADAPTER_TYPE_B: {
-                struct MessageUnit_B  *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B  *reg = acb->pmuB;
                 pqbuffer = (struct QBUFFER __iomem *)reg->ioctl_wbuffer_reg;
                 }
                 break;
@@ -1115,15 +1137,15 @@ static struct QBUFFER *arcmsr_get_iop_wqbuffer(struct AdapterControlBlock *acb)
 
 static void arcmsr_iop2drv_data_wrote_handle(struct AdapterControlBlock *acb)
 {
-        struct QBUFFER *prbuffer;
+        struct QBUFFER __iomem *prbuffer;
         struct QBUFFER *pQbuffer;
-        uint8_t *iop_data;
+        uint8_t __iomem *iop_data;
         int32_t my_empty_len, iop_len, rqbuf_firstindex, rqbuf_lastindex;
 
         rqbuf_lastindex = acb->rqbuf_lastindex;
         rqbuf_firstindex = acb->rqbuf_firstindex;
         prbuffer = arcmsr_get_iop_rqbuffer(acb);
-        iop_data = (uint8_t *)prbuffer->data;
+        iop_data = (uint8_t __iomem *)prbuffer->data;
         iop_len = prbuffer->data_len;
         my_empty_len = (rqbuf_firstindex - rqbuf_lastindex -1)&(ARCMSR_MAX_QBUFFER -1);
 
@@ -1151,8 +1173,8 @@ static void arcmsr_iop2drv_data_read_handle(struct AdapterControlBlock *acb)
         acb->acb_flags |= ACB_F_MESSAGE_WQBUFFER_READED;
         if (acb->wqbuf_firstindex != acb->wqbuf_lastindex) {
                 uint8_t *pQbuffer;
-                struct QBUFFER *pwbuffer;
-                uint8_t *iop_data;
+                struct QBUFFER __iomem *pwbuffer;
+                uint8_t __iomem *iop_data;
                 int32_t allxfer_len = 0;
 
                 acb->acb_flags &= (~ACB_F_MESSAGE_WQBUFFER_READED);
@@ -1181,7 +1203,7 @@ static void arcmsr_iop2drv_data_read_handle(struct AdapterControlBlock *acb)
 static void arcmsr_hba_doorbell_isr(struct AdapterControlBlock *acb)
 {
         uint32_t outbound_doorbell;
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
 
         outbound_doorbell = readl(&reg->outbound_doorbell);
         writel(outbound_doorbell, &reg->outbound_doorbell);
@@ -1197,7 +1219,7 @@ static void arcmsr_hba_doorbell_isr(struct AdapterControlBlock *acb)
 static void arcmsr_hba_postqueue_isr(struct AdapterControlBlock *acb)
 {
         uint32_t flag_ccb;
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
 
         while ((flag_ccb = readl(&reg->outbound_queueport)) != 0xFFFFFFFF) {
                 arcmsr_drain_donequeue(acb, flag_ccb);
@@ -1208,7 +1230,7 @@ static void arcmsr_hbb_postqueue_isr(struct AdapterControlBlock *acb)
 {
         uint32_t index;
         uint32_t flag_ccb;
-        struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+        struct MessageUnit_B *reg = acb->pmuB;
 
         index = reg->doneq_index;
 
@@ -1224,7 +1246,7 @@ static void arcmsr_hbb_postqueue_isr(struct AdapterControlBlock *acb)
 static int arcmsr_handle_hba_isr(struct AdapterControlBlock *acb)
 {
         uint32_t outbound_intstatus;
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
 
         outbound_intstatus = readl(&reg->outbound_intstatus) & \
                                                         acb->outbound_int_enable;
@@ -1244,7 +1266,7 @@ static int arcmsr_handle_hba_isr(struct AdapterControlBlock *acb)
 static int arcmsr_handle_hbb_isr(struct AdapterControlBlock *acb)
 {
         uint32_t outbound_doorbell;
-        struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+        struct MessageUnit_B *reg = acb->pmuB;
 
         outbound_doorbell = readl(reg->iop2drv_doorbell_reg) & \
                                                         acb->outbound_int_enable;
@@ -1305,8 +1327,8 @@ void arcmsr_post_ioctldata2iop(struct AdapterControlBlock *acb)
 {
         int32_t wqbuf_firstindex, wqbuf_lastindex;
         uint8_t *pQbuffer;
-        struct QBUFFER *pwbuffer;
-        uint8_t *iop_data;
+        struct QBUFFER __iomem *pwbuffer;
+        uint8_t __iomem *iop_data;
         int32_t allxfer_len = 0;
 
         pwbuffer = arcmsr_get_iop_wqbuffer(acb);
@@ -1380,13 +1402,13 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb, \
                 }
                 if (acb->acb_flags & ACB_F_IOPDATA_OVERFLOW) {
 
-                        struct QBUFFER *prbuffer;
-                        uint8_t *iop_data;
+                        struct QBUFFER __iomem *prbuffer;
+                        uint8_t __iomem *iop_data;
                         int32_t iop_len;
 
                         acb->acb_flags &= ~ACB_F_IOPDATA_OVERFLOW;
                         prbuffer = arcmsr_get_iop_rqbuffer(acb);
-                        iop_data = (uint8_t *)prbuffer->data;
+                        iop_data = prbuffer->data;
                         iop_len = readl(&prbuffer->data_len);
                         while (iop_len > 0) {
                                 acb->rqbuffer[acb->rqbuf_lastindex] = readb(iop_data);
@@ -1669,11 +1691,11 @@ static int arcmsr_queue_command(struct scsi_cmnd *cmd,
 
 static void arcmsr_get_hba_config(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
         char *acb_firm_model = acb->firm_model;
         char *acb_firm_version = acb->firm_version;
-        char *iop_firm_model = (char *) (&reg->message_rwbuffer[15]);
-        char *iop_firm_version = (char *) (&reg->message_rwbuffer[17]);
+        char __iomem *iop_firm_model = (char __iomem *)(&reg->message_rwbuffer[15]);
+        char __iomem *iop_firm_version = (char __iomem *)(&reg->message_rwbuffer[17]);
         int count;
 
         writel(ARCMSR_INBOUND_MESG0_GET_CONFIG, &reg->inbound_msgaddr0);
@@ -1710,13 +1732,13 @@ static void arcmsr_get_hba_config(struct AdapterControlBlock *acb)
 
 static void arcmsr_get_hbb_config(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
-        uint32_t *lrwbuffer = reg->msgcode_rwbuffer_reg;
+        struct MessageUnit_B *reg = acb->pmuB;
+        uint32_t __iomem *lrwbuffer = reg->msgcode_rwbuffer_reg;
         char *acb_firm_model = acb->firm_model;
         char *acb_firm_version = acb->firm_version;
-        char *iop_firm_model = (char *) (&lrwbuffer[15]);
+        char __iomem *iop_firm_model = (char __iomem *)(&lrwbuffer[15]);
         /*firm_model,15,60-67*/
-        char *iop_firm_version = (char *) (&lrwbuffer[17]);
+        char __iomem *iop_firm_version = (char __iomem *)(&lrwbuffer[17]);
         /*firm_version,17,68-83*/
         int count;
 
@@ -1777,7 +1799,7 @@ static void arcmsr_get_firmware_spec(struct AdapterControlBlock *acb)
 static void arcmsr_polling_hba_ccbdone(struct AdapterControlBlock *acb,
         struct CommandControlBlock *poll_ccb)
 {
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
         struct CommandControlBlock *ccb;
         uint32_t flag_ccb, outbound_intstatus, poll_ccb_done = 0, poll_count = 0;
 
@@ -1826,7 +1848,7 @@ static void arcmsr_polling_hba_ccbdone(struct AdapterControlBlock *acb,
 static void arcmsr_polling_hbb_ccbdone(struct AdapterControlBlock *acb, \
                                         struct CommandControlBlock *poll_ccb)
 {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 struct CommandControlBlock *ccb;
                 uint32_t flag_ccb, poll_ccb_done = 0, poll_count = 0;
                 int index;
@@ -1918,8 +1940,7 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
 
         case ACB_ADAPTER_TYPE_A: {
                 if (ccb_phyaddr_hi32 != 0) {
-                        struct MessageUnit_A __iomem *reg = \
-                                        (struct MessageUnit_A *)acb->pmu;
+                        struct MessageUnit_A __iomem *reg = acb->pmuA;
                         uint32_t intmask_org;
                         intmask_org = arcmsr_disable_outbound_ints(acb);
                         writel(ARCMSR_SIGNATURE_SET_CONFIG, \
@@ -1940,9 +1961,9 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
 
         case ACB_ADAPTER_TYPE_B: {
                 unsigned long post_queue_phyaddr;
-                uint32_t *rwbuffer;
+                uint32_t __iomem *rwbuffer;
 
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 uint32_t intmask_org;
                 intmask_org = arcmsr_disable_outbound_ints(acb);
                 reg->postq_index = 0;
@@ -1994,7 +2015,7 @@ static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb)
         switch (acb->adapter_type) {
 
         case ACB_ADAPTER_TYPE_A: {
-                struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
                 do {
                         firmware_state = readl(&reg->outbound_msgaddr1);
                 } while ((firmware_state & ARCMSR_OUTBOUND_MESG1_FIRMWARE_OK) == 0);
@@ -2002,7 +2023,7 @@ static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb)
                 break;
 
         case ACB_ADAPTER_TYPE_B: {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 do {
                         firmware_state = readl(reg->iop2drv_doorbell_reg);
                 } while ((firmware_state & ARCMSR_MESSAGE_FIRMWARE_OK) == 0);
@@ -2013,7 +2034,7 @@ static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb)
 
 static void arcmsr_start_hba_bgrb(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_A __iomem *reg = (struct MessageUnit_A *)acb->pmu;
+        struct MessageUnit_A __iomem *reg = acb->pmuA;
         acb->acb_flags |= ACB_F_MSG_START_BGRB;
         writel(ARCMSR_INBOUND_MESG0_START_BGRB, &reg->inbound_msgaddr0);
         if (arcmsr_hba_wait_msgint_ready(acb)) {
@@ -2024,7 +2045,7 @@ static void arcmsr_start_hba_bgrb(struct AdapterControlBlock *acb)
 
 static void arcmsr_start_hbb_bgrb(struct AdapterControlBlock *acb)
 {
-        struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+        struct MessageUnit_B *reg = acb->pmuB;
         acb->acb_flags |= ACB_F_MSG_START_BGRB;
         writel(ARCMSR_MESSAGE_START_BGRB, reg->drv2iop_doorbell_reg);
         if (arcmsr_hbb_wait_msgint_ready(acb)) {
@@ -2049,7 +2070,7 @@ static void arcmsr_clear_doorbell_queue_buffer(struct AdapterControlBlock *acb)
 {
         switch (acb->adapter_type) {
         case ACB_ADAPTER_TYPE_A: {
-                struct MessageUnit_A *reg = (struct MessageUnit_A *)acb->pmu;
+                struct MessageUnit_A __iomem *reg = acb->pmuA;
                 uint32_t outbound_doorbell;
                 /* empty doorbell Qbuffer if door bell ringed */
                 outbound_doorbell = readl(&reg->outbound_doorbell);
@@ -2060,7 +2081,7 @@ static void arcmsr_clear_doorbell_queue_buffer(struct AdapterControlBlock *acb)
                 break;
 
         case ACB_ADAPTER_TYPE_B: {
-                struct MessageUnit_B *reg = (struct MessageUnit_B *)acb->pmu;
+                struct MessageUnit_B *reg = acb->pmuB;
                 /*clear interrupt and message state*/
                 writel(ARCMSR_MESSAGE_INT_CLEAR_PATTERN, reg->iop2drv_doorbell_reg);
                 writel(ARCMSR_DRV2IOP_DATA_READ_OK, reg->drv2iop_doorbell_reg);
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index b5fa4f091387..f1871ea04045 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1652,6 +1652,7 @@ sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp, int tablesize)
         schp->buffer = kzalloc(sg_bufflen, gfp_flags);
         if (!schp->buffer)
                 return -ENOMEM;
+        sg_init_table(schp->buffer, tablesize);
         schp->sglist_len = sg_bufflen;
         return tablesize;       /* number of scat_gath elements allocated */
 }
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index c55459c592b8..b3518ca9f04e 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -184,14 +184,14 @@ static int spidev_message(struct spidev_data *spidev,
                 if (u_tmp->rx_buf) {
                         k_tmp->rx_buf = buf;
                         if (!access_ok(VERIFY_WRITE, (u8 __user *)
-                                                (ptrdiff_t) u_tmp->rx_buf,
+                                                (uintptr_t) u_tmp->rx_buf,
                                                 u_tmp->len))
                                 goto done;
                 }
                 if (u_tmp->tx_buf) {
                         k_tmp->tx_buf = buf;
                         if (copy_from_user(buf, (const u8 __user *)
-                                                (ptrdiff_t) u_tmp->tx_buf,
+                                                (uintptr_t) u_tmp->tx_buf,
                                         u_tmp->len))
                                 goto done;
                 }
@@ -224,7 +224,7 @@ static int spidev_message(struct spidev_data *spidev,
         for (n = n_xfers, u_tmp = u_xfers; n; n--, u_tmp++) {
                 if (u_tmp->rx_buf) {
                         if (__copy_to_user((u8 __user *)
-                                        (ptrdiff_t) u_tmp->rx_buf, buf,
+                                        (uintptr_t) u_tmp->rx_buf, buf,
                                         u_tmp->len)) {
                                 status = -EFAULT;
                                 goto done;