diff for duplicates of <5640F4C8.5060206@gmx.de> diff --git a/a/1.txt b/N1/1.txt index 2d2c232..c827300 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,8 +71,7 @@ Helge > +** We need to support 4 different coherent dma models with one binary: > +** > ** I/O MMU consistent method dma_sync behavior -> ** ============= ====================== ======================= -> ** a) PA-7x00LC uncachable host memory flush/purge +> ** ======= =========== ===========> ** a) PA-7x00LC uncachable host memory flush/purge > @@ -40,158 +21,22 @@ struct hppa_dma_ops { > */ > @@ -309,7 +308,7 @@ Helge > + enum dma_data_direction direction, struct dma_attrs *attrs) > { > + void *addr = page_address(page) + offset; -> BUG_ON(direction == DMA_NONE); +> BUG_ON(direction = DMA_NONE); > > flush_kernel_dcache_range((unsigned long) addr, size); > return virt_to_phys(addr); @@ -320,7 +319,7 @@ Helge > + size_t size, enum dma_data_direction direction, > + struct dma_attrs *attrs) > { -> BUG_ON(direction == DMA_NONE); +> BUG_ON(direction = DMA_NONE); > > @@ -475,7 +482,9 @@ static void pa11_dma_unmap_single(struct device *dev, dma_addr_t dma_handle, siz > return; @@ -353,7 +352,7 @@ Helge > + dma_addr_t dma_handle, size_t size, > + enum dma_data_direction direction) > { -> BUG_ON(direction == DMA_NONE); +> BUG_ON(direction = DMA_NONE); > > - flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle) + offset, size); > + flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle), @@ -365,7 +364,7 @@ Helge > + dma_addr_t dma_handle, size_t size, > + enum dma_data_direction direction) > { -> BUG_ON(direction == DMA_NONE); +> BUG_ON(direction = DMA_NONE); > > - flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle) + offset, size); > + flush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle), diff --git a/a/content_digest b/N1/content_digest index 0e82abd..49ad49e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01447093041-21832-10-git-send-email-hch@lst.de\0" "From\0Helge Deller <deller@gmx.de>\0" "Subject\0Re: [PATCH 09/16] parisc: convert to dma_map_ops\0" - "Date\0Mon, 9 Nov 2015 20:32:24 +0100\0" + "Date\0Mon, 09 Nov 2015 19:32:24 +0000\0" "To\0Christoph Hellwig <hch@lst.de>" Andrew Morton <akpm@linux-foundation.org> Haavard Skinnemoen <hskinnemoen@gmail.com> @@ -94,8 +94,7 @@ "> +** We need to support 4 different coherent dma models with one binary:\n" "> +**\n" "> ** I/O MMU consistent method dma_sync behavior\n" - "> ** ============= ====================== =======================\n" - "> ** a) PA-7x00LC uncachable host memory flush/purge\n" + "> ** ======= =========== ===========> ** a) PA-7x00LC uncachable host memory flush/purge\n" "> @@ -40,158 +21,22 @@ struct hppa_dma_ops {\n" "> */\n" "> \n" @@ -332,7 +331,7 @@ "> +\t\tenum dma_data_direction direction, struct dma_attrs *attrs)\n" "> {\n" "> +\tvoid *addr = page_address(page) + offset;\n" - "> \tBUG_ON(direction == DMA_NONE);\n" + "> \tBUG_ON(direction = DMA_NONE);\n" "> \n" "> \tflush_kernel_dcache_range((unsigned long) addr, size);\n" "> \treturn virt_to_phys(addr);\n" @@ -343,7 +342,7 @@ "> +\t\tsize_t size, enum dma_data_direction direction,\n" "> +\t\tstruct dma_attrs *attrs)\n" "> {\n" - "> \tBUG_ON(direction == DMA_NONE);\n" + "> \tBUG_ON(direction = DMA_NONE);\n" "> \n" "> @@ -475,7 +482,9 @@ static void pa11_dma_unmap_single(struct device *dev, dma_addr_t dma_handle, siz\n" "> \treturn;\n" @@ -376,7 +375,7 @@ "> +\t\tdma_addr_t dma_handle, size_t size,\n" "> +\t\tenum dma_data_direction direction)\n" "> {\n" - "> \tBUG_ON(direction == DMA_NONE);\n" + "> \tBUG_ON(direction = DMA_NONE);\n" "> \n" "> -\tflush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle) + offset, size);\n" "> +\tflush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle),\n" @@ -388,7 +387,7 @@ "> +\t\tdma_addr_t dma_handle, size_t size,\n" "> +\t\tenum dma_data_direction direction)\n" "> {\n" - "> \tBUG_ON(direction == DMA_NONE);\n" + "> \tBUG_ON(direction = DMA_NONE);\n" "> \n" "> -\tflush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle) + offset, size);\n" "> +\tflush_kernel_dcache_range((unsigned long) phys_to_virt(dma_handle),\n" @@ -752,4 +751,4 @@ "> \n" > -3b472fd5061304f48b992d1e7cff72ce19988b2d4895c5ec6b05ea1d12e4390a +f6db0c54ce718f1eb8fda666cd147733e0e9d512c1d527931d0d67e9749cc6ac
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.