The patch titled dma-mapping-x86-per-device-dma_mapping_ops-support-fix has been removed from the -mm tree. Its filename was dma-mapping-x86-per-device-dma_mapping_ops-support-fix.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-x86-per-device-dma_mapping_ops-support-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> In file included from include/linux/dma-mapping.h:52, from include/linux/dmaengine.h:29, from include/linux/skbuff.h:29, from include/linux/netlink.h:155, from include/linux/genetlink.h:4, from include/net/genetlink.h:4, from include/linux/taskstats_kern.h:12, from include/linux/delayacct.h:21, from fs/proc/array.c:80: include/asm/dma-mapping.h: In function 'dma_mapping_error': include/asm/dma-mapping.h:78: warning: unused variable 'ops' Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Cc: Avi Kivity <avi@xxxxxxxxxxxx> Cc: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Muli Ben-Yehuda <muli@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-x86/dma-mapping.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN include/asm-x86/dma-mapping.h~dma-mapping-x86-per-device-dma_mapping_ops-support-fix include/asm-x86/dma-mapping.h --- a/include/asm-x86/dma-mapping.h~dma-mapping-x86-per-device-dma_mapping_ops-support-fix +++ a/include/asm-x86/dma-mapping.h @@ -74,11 +74,10 @@ static inline struct dma_mapping_ops *ge /* Make sure we keep the same behaviour */ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - struct dma_mapping_ops *ops = get_dma_ops(dev); - #ifdef CONFIG_X86_32 return 0; #else + struct dma_mapping_ops *ops = get_dma_ops(dev); if (ops->mapping_error) return ops->mapping_error(dev, dma_addr); _ 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-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