diff for duplicates of <20050912234532.GH19644@tuxdriver.com> diff --git a/a/1.txt b/N1/1.txt index 3b2afc6..4d0c481 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,14 +13,14 @@ diff --git a/lib/swiotlb.c b/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -315,13 +315,13 @@ sync_single(struct device *hwdev, char * case SYNC_FOR_CPU: - if (likely(dir = DMA_FROM_DEVICE || dma = DMA_BIDIRECTIONAL)) + if (likely(dir == DMA_FROM_DEVICE || dma == DMA_BIDIRECTIONAL)) memcpy(buffer, dma_addr, size); - else if (dir != DMA_TO_DEVICE && dir != DMA_NONE) + else if (dir != DMA_TO_DEVICE) BUG(); break; case SYNC_FOR_DEVICE: - if (likely(dir = DMA_TO_DEVICE || dma = DMA_BIDIRECTIONAL)) + if (likely(dir == DMA_TO_DEVICE || dma == DMA_BIDIRECTIONAL)) memcpy(dma_addr, buffer, size); - else if (dir != DMA_FROM_DEVICE && dir != DMA_NONE) + else if (dir != DMA_FROM_DEVICE) @@ -31,25 +31,25 @@ diff --git a/lib/swiotlb.c b/lib/swiotlb.c { 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, target); - else if (dir = DMA_FROM_DEVICE) + else if (dir == DMA_FROM_DEVICE) @@ -547,8 +545,6 @@ swiotlb_sync_single_range(struct device { 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, target); - else if (dir = DMA_FROM_DEVICE) + else if (dir == DMA_FROM_DEVICE) @@ -651,9 +647,6 @@ swiotlb_sync_sg(struct device *hwdev, st { int i; -- if (dir = DMA_NONE) +- if (dir == DMA_NONE) - BUG(); - for (i = 0; i < nelems; i++, sg++) diff --git a/a/content_digest b/N1/content_digest index a416326..ce70f66 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "ref\020050912202333.GF21820@esmail.cup.hp.com\0" "From\0John W. Linville <linville@tuxdriver.com>\0" "Subject\0[patch 2.6.13 (take #2)] swiotlb: BUG() for DMA_NONE in sync_single\0" - "Date\0Mon, 12 Sep 2005 23:45:34 +0000\0" + "Date\0Mon, 12 Sep 2005 19:45:34 -0400\0" "To\0Grant Grundler <iod00d@hp.com>\0" "Cc\0linux-kernel@vger.kernel.org" discuss@x86-64.org @@ -31,14 +31,14 @@ "+++ b/lib/swiotlb.c\n" "@@ -315,13 +315,13 @@ sync_single(struct device *hwdev, char *\n" " \tcase SYNC_FOR_CPU:\n" - " \t\tif (likely(dir = DMA_FROM_DEVICE || dma = DMA_BIDIRECTIONAL))\n" + " \t\tif (likely(dir == DMA_FROM_DEVICE || dma == DMA_BIDIRECTIONAL))\n" " \t\t\tmemcpy(buffer, dma_addr, size);\n" "-\t\telse if (dir != DMA_TO_DEVICE && dir != DMA_NONE)\n" "+\t\telse if (dir != DMA_TO_DEVICE)\n" " \t\t\tBUG();\n" " \t\tbreak;\n" " \tcase SYNC_FOR_DEVICE:\n" - " \t\tif (likely(dir = DMA_TO_DEVICE || dma = DMA_BIDIRECTIONAL))\n" + " \t\tif (likely(dir == DMA_TO_DEVICE || dma == DMA_BIDIRECTIONAL))\n" " \t\t\tmemcpy(dma_addr, buffer, size);\n" "-\t\telse if (dir != DMA_FROM_DEVICE && dir != DMA_NONE)\n" "+\t\telse if (dir != DMA_FROM_DEVICE)\n" @@ -49,25 +49,25 @@ " {\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, target);\n" - " \telse if (dir = DMA_FROM_DEVICE)\n" + " \telse if (dir == DMA_FROM_DEVICE)\n" "@@ -547,8 +545,6 @@ swiotlb_sync_single_range(struct device \n" " {\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, target);\n" - " \telse if (dir = DMA_FROM_DEVICE)\n" + " \telse if (dir == DMA_FROM_DEVICE)\n" "@@ -651,9 +647,6 @@ swiotlb_sync_sg(struct device *hwdev, st\n" " {\n" " \tint i;\n" " \n" - "-\tif (dir = DMA_NONE)\n" + "-\tif (dir == DMA_NONE)\n" "-\t\tBUG();\n" "-\n" " \tfor (i = 0; i < nelems; i++, sg++)\n" @@ -77,4 +77,4 @@ "John W. Linville\n" linville@tuxdriver.com -cddef284cb96bd7961234b44ba94fbddd759d61785a7440129b21e02ee3d3a5d +1fae50786b8571945b96b94feb9ea0d219ff0d37a6ea950a87177e7dd70ad2d1
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.