The patch titled dma-mapping-add-the-device-argument-to-dma_mapping_error-pasemi_mac has been removed from the -mm tree. Its filename was dma-mapping-add-the-device-argument-to-dma_mapping_error-pasemi_mac.patch This patch was dropped because it was folded into dma-mapping-add-the-device-argument-to-dma_mapping_error.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: dma-mapping-add-the-device-argument-to-dma_mapping_error-pasemi_mac From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Is this right? Cc: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/pasemi_mac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/net/pasemi_mac.c~dma-mapping-add-the-device-argument-to-dma_mapping_error-pasemi_mac drivers/net/pasemi_mac.c --- a/drivers/net/pasemi_mac.c~dma-mapping-add-the-device-argument-to-dma_mapping_error-pasemi_mac +++ a/drivers/net/pasemi_mac.c @@ -650,7 +650,7 @@ static void pasemi_mac_replenish_rx_ring mac->bufsz - LOCAL_SKB_ALIGN, PCI_DMA_FROMDEVICE); - if (unlikely(mac->dma_pdev, dma_mapping_error(dma))) { + if (unlikely(pci_dma_mapping_error(mac->dma_pdev, dma))) { dev_kfree_skb_irq(info->skb); break; } @@ -1519,7 +1519,7 @@ static int pasemi_mac_start_tx(struct sk map[0] = pci_map_single(mac->dma_pdev, skb->data, skb_headlen(skb), PCI_DMA_TODEVICE); map_size[0] = skb_headlen(skb); - if (dma_mapping_error(mac->dma_pdev, map[0])) + if (pci_dma_mapping_error(mac->dma_pdev, map[0])) goto out_err_nolock; for (i = 0; i < nfrags; i++) { @@ -1529,7 +1529,7 @@ static int pasemi_mac_start_tx(struct sk frag->page_offset, frag->size, PCI_DMA_TODEVICE); map_size[i+1] = frag->size; - if (dma_mapping_error(mac->dma_pdev, map[i+1])) { + if (pci_dma_mapping_error(mac->dma_pdev, map[i+1])) { nfrags = i; goto out_err_nolock; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch uninline-arch_pick_mmap_layout.patch dma-mapping-add-the-device-argument-to-dma_mapping_error.patch dma-mapping-add-the-device-argument-to-dma_mapping_error-pasemi_mac.patch dma-mapping-x86-per-device-dma_mapping_ops-support-fix.patch dma-mapping-add-the-device-argument-to-dma_mapping_error-sdhci-fix.patch dma-mapping-add-the-device-argument-to-dma_mapping_error-infiniband.patch dma-mapping-add-the-device-argument-to-dma_mapping_error-more-sparc.patch dma-mapping-add-the-device-argument-to-dma_mapping_error-ibmvscsi.patch x86-calgary-fix-handling-of-devices-that-arent-behind-the-calgary-checkpatch-fixes.patch tpm-increase-size-of-internal-tpm-response-buffers-checkpatch-fixes.patch memstick-allow-set_param-method-to-return-an-error-code-checkpatch-fixes.patch memstick-use-fully-asynchronous-request-processing-fix.patch full-conversion-to-early_initcall-interface-remove-old-interface-cleanup.patch full-conversion-to-early_initcall-interface-remove-old-interface-fix.patch ppc-use-the-common-ascii-hex-helpers-fix.patch gru-driver-v3-hardware-data-structures-fix.patch gru-driver-v3-hardware-data-structures-fix-fix.patch gcov-architecture-specific-compile-flag-adjustments-powerpc-moved-stuff.patch mm-introduce-get_user_pages_fast-fix.patch mm-introduce-get_user_pages_fast-checkpatch-fixes.patch x86-lockless-get_user_pages_fast-checkpatch-fixes.patch x86-lockless-get_user_pages_fast-fix.patch x86-lockless-get_user_pages_fast-fix-2.patch x86-lockless-get_user_pages_fast-fix-2-fix-fix.patch x86-lockless-get_user_pages_fast-fix-warning.patch mm-speculative-page-references-fix-add_to_page_cache-fix.patch vmscan-move-isolate_lru_page-to-vmscanc-fix.patch define-page_file_cache-function-fix.patch vmscan-split-lru-lists-into-anon-file-sets-units-fix.patch unevictable-lru-infrastructure-fix.patch unevictable-lru-page-statistics-units-fix.patch mlock-mlocked-pages-are-unevictable-fix.patch mlock-mlocked-pages-are-unevictable-fix-fix.patch mlock-mlocked-pages-are-unevictable-fix-3.patch mmap-handle-mlocked-pages-during-map-remap-unmap-cleanup.patch introduce-__get_user_pages-fix.patch vmscan-unevictable-lru-scan-sysctl-nommu-fix.patch slb-drop-kmem-cache-argument-from-constructor-fix.patch slb-drop-kmem-cache-argument-from-constructor-fix-fix.patch slb-drop-kmem-cache-argument-from-constructor-fix-fix-logfs.patch slb-drop-kmem-cache-argument-from-constructor-ubifs.patch video-console-sticonrec-make-code-static-checkpatch-fixes.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.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