diff for duplicates of <201007262130.o6QLUS6T010902@imap1.linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index 995bed6..9088ab3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -342,3 +342,18 @@ diff -puN include/asm-generic/dma-mapping-broken.h~dma-mapping-remove-dma_is_con -extern int -dma_is_consistent(struct device *dev, dma_addr_t dma_handle); +- + extern void + dma_cache_sync(struct device *dev, void *vaddr, size_t size, + enum dma_data_direction direction); +_ + +Patches currently in -mm which might be from fujita.tomonori@lab.ntt.co.jp are + +linux-next.patch +scsi-add-__init-__exit-macros-to-ibmvstgtc.patch +dma-mapping-rename-arch_kmalloc_minalign-to-arch_dma_minalign.patch +dma-mapping-unify-dma_get_cache_alignment-implementations.patch +dma-mapping-parisc-set-arch_dma_minalign.patch +drivers-scsi-53c700c-remove-dma_is_consistent-usage.patch +dma-mapping-remove-dma_is_consistent-api.patch diff --git a/a/content_digest b/N1/content_digest index 01f726c..875940a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -351,6 +351,21 @@ " dma_get_cache_alignment(void);\n" " \n" "-extern int\n" - -dma_is_consistent(struct device *dev, dma_addr_t dma_handle); + "-dma_is_consistent(struct device *dev, dma_addr_t dma_handle);\n" + "-\n" + " extern void\n" + " dma_cache_sync(struct device *dev, void *vaddr, size_t size,\n" + " \t enum dma_data_direction direction);\n" + "_\n" + "\n" + "Patches currently in -mm which might be from fujita.tomonori@lab.ntt.co.jp are\n" + "\n" + "linux-next.patch\n" + "scsi-add-__init-__exit-macros-to-ibmvstgtc.patch\n" + "dma-mapping-rename-arch_kmalloc_minalign-to-arch_dma_minalign.patch\n" + "dma-mapping-unify-dma_get_cache_alignment-implementations.patch\n" + "dma-mapping-parisc-set-arch_dma_minalign.patch\n" + "drivers-scsi-53c700c-remove-dma_is_consistent-usage.patch\n" + dma-mapping-remove-dma_is_consistent-api.patch -3373ccfa20e0b9fdf22027599a8633f27cd5676aae07a69e5c9ac5fb3c4a6515 +4aa96afd9581bae80ac4a75714e8762b0281d1cf29a5458eacb6aee8e89cb21d
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox