diff for duplicates of <20050830183337.GF18998@tuxdriver.com> diff --git a/a/1.txt b/N1/1.txt index 160c90f..6a06ae0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,7 @@ P.S. This is meant to apply on top of my previous swiotlb patch... - char *dma_addr = phys_to_virt(dev_addr); + char *dma_addr = phys_to_virt(dev_addr) + offset; - if (dir = DMA_NONE) + if (dir == DMA_NONE) BUG(); @@ -508,17 +508,17 @@ swiotlb_sync_single_for_cpu(struct devic } @@ -51,11 +51,11 @@ P.S. This is meant to apply on top of my previous swiotlb patch... { - char *dma_addr = phys_to_virt(dev_addr); - -- if (dir = DMA_NONE) +- if (dir == DMA_NONE) - BUG(); - if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) - sync_single(hwdev, dma_addr, size, dir); -- else if (dir = DMA_FROM_DEVICE) +- else if (dir == DMA_FROM_DEVICE) - mark_clean(dma_addr, size); + swiotlb_sync_single_range(hwdev, dev_addr, 0, size, dir); } @@ -67,11 +67,11 @@ P.S. This is meant to apply on top of my previous swiotlb patch... { - char *dma_addr = phys_to_virt(dev_addr) + offset; - -- if (dir = DMA_NONE) +- if (dir == DMA_NONE) - BUG(); - if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) - sync_single(hwdev, dma_addr, size, dir); -- else if (dir = DMA_FROM_DEVICE) +- else if (dir == DMA_FROM_DEVICE) - mark_clean(dma_addr, size); + swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir); } @@ -82,11 +82,11 @@ P.S. This is meant to apply on top of my previous swiotlb patch... { - char *dma_addr = phys_to_virt(dev_addr) + offset; - -- if (dir = DMA_NONE) +- if (dir == DMA_NONE) - BUG(); - if (dma_addr >= io_tlb_start && dma_addr < io_tlb_end) - sync_single(hwdev, dma_addr, size, dir); -- else if (dir = DMA_FROM_DEVICE) +- else if (dir == DMA_FROM_DEVICE) - mark_clean(dma_addr, size); + swiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir); } diff --git a/a/content_digest b/N1/content_digest index cd9fa4d..1c7a4ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020050830180912.GE18998@tuxdriver.com\0" "From\0John W. Linville <linville@tuxdriver.com>\0" "Subject\0[rfc patch] swiotlb: consolidate swiotlb_sync_single_* implementations\0" - "Date\0Tue, 30 Aug 2005 18:33:39 +0000\0" + "Date\0Tue, 30 Aug 2005 14:33:39 -0400\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Andi Kleen <ak@suse.de>" discuss@x86-64.org @@ -46,7 +46,7 @@ "-\tchar *dma_addr = phys_to_virt(dev_addr);\n" "+\tchar *dma_addr = phys_to_virt(dev_addr) + offset;\n" " \n" - " \tif (dir = DMA_NONE)\n" + " \tif (dir == DMA_NONE)\n" " \t\tBUG();\n" "@@ -508,17 +508,17 @@ swiotlb_sync_single_for_cpu(struct devic\n" " }\n" @@ -64,11 +64,11 @@ " {\n" "-\tchar *dma_addr = phys_to_virt(dev_addr);\n" "-\n" - "-\tif (dir = DMA_NONE)\n" + "-\tif (dir == DMA_NONE)\n" "-\t\tBUG();\n" "-\tif (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)\n" "-\t\tsync_single(hwdev, dma_addr, size, dir);\n" - "-\telse if (dir = DMA_FROM_DEVICE)\n" + "-\telse if (dir == DMA_FROM_DEVICE)\n" "-\t\tmark_clean(dma_addr, size);\n" "+\tswiotlb_sync_single_range(hwdev, dev_addr, 0, size, dir);\n" " }\n" @@ -80,11 +80,11 @@ " {\n" "-\tchar *dma_addr = phys_to_virt(dev_addr) + offset;\n" "-\n" - "-\tif (dir = DMA_NONE)\n" + "-\tif (dir == DMA_NONE)\n" "-\t\tBUG();\n" "-\tif (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)\n" "-\t\tsync_single(hwdev, dma_addr, size, dir);\n" - "-\telse if (dir = DMA_FROM_DEVICE)\n" + "-\telse if (dir == DMA_FROM_DEVICE)\n" "-\t\tmark_clean(dma_addr, size);\n" "+\tswiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir);\n" " }\n" @@ -95,11 +95,11 @@ " {\n" "-\tchar *dma_addr = phys_to_virt(dev_addr) + offset;\n" "-\n" - "-\tif (dir = DMA_NONE)\n" + "-\tif (dir == DMA_NONE)\n" "-\t\tBUG();\n" "-\tif (dma_addr >= io_tlb_start && dma_addr < io_tlb_end)\n" "-\t\tsync_single(hwdev, dma_addr, size, dir);\n" - "-\telse if (dir = DMA_FROM_DEVICE)\n" + "-\telse if (dir == DMA_FROM_DEVICE)\n" "-\t\tmark_clean(dma_addr, size);\n" "+\tswiotlb_sync_single_range(hwdev, dev_addr, offset, size, dir);\n" " }\n" @@ -109,4 +109,4 @@ "John W. Linville\n" linville@tuxdriver.com -e2f768af447efe44434c40dc137fe827fe5981f4f63ab0e842195a2f0fbd6907 +d5a20d417db14d21e828aef138b4b36e62bbd54e7aa2907b1844abccd3764e7a
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.