diff for duplicates of <09122005104850.30992@bilbo.tuxdriver.com> diff --git a/a/1.txt b/N1/1.txt index cddc250..0dae35f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,11 +41,11 @@ 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); -- else if (dir = DMA_FROM_DEVICE) +- else if (dir == DMA_FROM_DEVICE) - mark_clean(dma_addr, size); + swiotlb_sync_single(hwdev, dev_addr, size, dir); } @@ -80,7 +80,7 @@ diff --git a/lib/swiotlb.c b/lib/swiotlb.c { - 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 da6835d..7f2461f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\009122005104850.30928@bilbo.tuxdriver.com\0" "From\0John W. Linville <linville@tuxdriver.com>\0" "Subject\0[patch 2.6.13 2/6] swiotlb: cleanup some code duplication cruft\0" - "Date\0Mon, 12 Sep 2005 14:48:50 +0000\0" + "Date\0Mon, 12 Sep 2005 10:48:50 -0400\0" "To\0linux-kernel@vger.kernel.org" discuss@x86-64.org " linux-ia64@vger.kernel.org\0" @@ -53,11 +53,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(hwdev, dev_addr, size, dir);\n" " }\n" @@ -92,7 +92,7 @@ " {\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" @@ -104,4 +104,4 @@ " \n" int -66c0e5dde94489cc975be4451c9fe07037f4835b92ffec927937d47fe23c02f7 +4f55c10372ebd35742b2678222f616fc476eb8343c4177e6fcc31ed57f88504f
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.