The patch titled cciss: change Cmd_sg_list.sg_chain_dma type to dma_addr_t has been removed from the -mm tree. Its filename was cciss-change-cmd_sg_listsg_chain_dma-type-to-dma_addr_t.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cciss: change Cmd_sg_list.sg_chain_dma type to dma_addr_t From: Alex Chiang <achiang@xxxxxx> Fix regression in this linux-next patch: : commit 5c07a311a80adb0138fc08e8279c60255d88d0b8 : Author: Don Brace <brace@xxxxxxxxxxxxxxxxxx> : Date: Thu Nov 12 12:50:01 2009 -0600 : : cciss: Add enhanced scatter-gather support. It broke the ia64 build because of this hunk: --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h +struct Cmd_sg_list { + SGDescriptor_struct *sgchain; + dma64_addr_t sg_chain_dma; + int chain_block_size; +}; The issue is that dma64_addr_t isn't #define'd on ia64. The way that we're using Cmd_sg_list.sg_chain_dma is to hold an address returned from pci_map_single(). + temp64.val = pci_map_single(h->pdev, + h->cmd_sg_list[c->cmdindex]->sgchain, + len, dir); + + h->cmd_sg_list[c->cmdindex]->sg_chain_dma = temp64.val; pci_map_single() returns a dma_addr_t too. This code will still work even on a 32-bit x86 build, where dma_addr_t is defined to be a u32 because it will simply be promoted to the __u64 that temp64.val is defined as. Thus, declaring Cmd_sg_list.sg_chain_dma as dma_addr_t is safe. Signed-off-by: Alex Chiang <achiang@xxxxxx> Cc: Don Brace <brace@xxxxxxxxxxxxxxxxxx> Cc: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/block/cciss.h~cciss-change-cmd_sg_listsg_chain_dma-type-to-dma_addr_t drivers/block/cciss.h --- a/drivers/block/cciss.h~cciss-change-cmd_sg_listsg_chain_dma-type-to-dma_addr_t +++ a/drivers/block/cciss.h @@ -57,7 +57,7 @@ typedef struct _drive_info_struct struct Cmd_sg_list { SGDescriptor_struct *sgchain; - dma64_addr_t sg_chain_dma; + dma_addr_t sg_chain_dma; int chain_block_size; }; _ Patches currently in -mm which might be from achiang@xxxxxx are linux-next.patch scsi-add-hpsa-driver-for-hp-smart-array-controllers.patch page-types-learn-to-describe-flags-directly-from-command-line.patch page-types-whitespace-alignment.patch page-types-exit-early-when-invoked-with-d-describe.patch mm-add-numa-node-symlink-for-memory-section-in-sysfs.patch mm-refactor-register_cpu_under_node.patch mm-refactor-unregister_cpu_under_node.patch mm-add-numa-node-symlink-for-cpu-devices-in-sysfs.patch documentation-abi-sys-devices-system-cpu-cpu-node.patch mm-slab-allocate-memory-section-nodemask-for-large-systems.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html