Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

[linux-2.6-omap-h63xx.git] / drivers / infiniband / ulp / iser / iscsi_iser.h

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 9c53916f28c24d89a8d8e6bbd8616cfe62783423..cae8c96a55f8dbb77cd43a36ab4a3b166dc0fb46 100644 (file)
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -182,7 +182,7 @@ struct iser_regd_buf {
        struct iser_mem_reg     reg;        /* memory registration info        */
        void                    *virt_addr;
        struct iser_device      *device;    /* device->device for dma_unmap    */
-       dma_addr_t              dma_addr;   /* if non zero, addr for dma_unmap */
+       u64                     dma_addr;   /* if non zero, addr for dma_unmap */
        enum dma_data_direction direction;  /* direction for dma_unmap         */
        unsigned int            data_size;
        atomic_t                ref_count;  /* refcount, freed when dec to 0   */
@@ -283,7 +283,7 @@ struct iser_global {
        struct mutex      connlist_mutex;
        struct list_head  connlist;             /* all iSER IB connections */
 
-       kmem_cache_t *desc_cache;
+       struct kmem_cache *desc_cache;
 };
 
 extern struct iser_global ig;