diff for duplicates of <20100308165500.GB4568@phenom.dumpdata.com> diff --git a/a/1.txt b/N1/1.txt index f4142a4..c7eec6d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -95,8 +95,8 @@ git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git xen-swiotlb > local_irq_save(flags); > buffer = kmap_atomic(pfn_to_page(pfn), > KM_BOUNCE_READ); -> - if (dir = DMA_TO_DEVICE) -> + if (dir = DMA_TO_DEVICE) { +> - if (dir == DMA_TO_DEVICE) +> + if (dir == DMA_TO_DEVICE) { > memcpy(dma_addr, buffer + offset, sz); > - else > + swiotlb_dma_sync(dma_addr, sz, dir); @@ -111,8 +111,8 @@ git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git xen-swiotlb > offset = 0; > } > } else { -> - if (dir = DMA_TO_DEVICE) -> + if (dir = DMA_TO_DEVICE) { +> - if (dir == DMA_TO_DEVICE) +> + if (dir == DMA_TO_DEVICE) { > memcpy(dma_addr, phys_to_virt(phys), size); > - else > + swiotlb_dma_sync(dma_addr, size, dir); diff --git a/a/content_digest b/N1/content_digest index 7288973..f164d45 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,14 @@ "ref\01267963912-984-1-git-send-email-albert_herranz@yahoo.es\0" "ref\01267963912-984-5-git-send-email-albert_herranz@yahoo.es\0" "From\0Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>\0" - "Subject\0Re: [LKML] [RFC PATCH v3 04/11] swiotlb: support\0" - "Date\0Mon, 08 Mar 2010 16:55:00 +0000\0" + "Subject\0Re: [LKML] [RFC PATCH v3 04/11] swiotlb: support NOT_COHERENT_CACHE PowerPC platforms\0" + "Date\0Mon, 8 Mar 2010 11:55:00 -0500\0" "To\0Albert Herranz <albert_herranz@yahoo.es>\0" - "Cc\0linux-usb@vger.kernel.org" + "Cc\0x86@kernel.org" + linux-ia64@vger.kernel.org + linux-usb@vger.kernel.org linuxppc-dev@lists.ozlabs.org - linux-kernel@vger.kernel.org - x86@kernel.org - " linux-ia64@vger.kernel.org\0" + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Sun, Mar 07, 2010 at 01:11:45PM +0100, Albert Herranz wrote:\n" @@ -108,8 +108,8 @@ "> \t\t\tlocal_irq_save(flags);\n" "> \t\t\tbuffer = kmap_atomic(pfn_to_page(pfn),\n" "> \t\t\t\t\t KM_BOUNCE_READ);\n" - "> -\t\t\tif (dir = DMA_TO_DEVICE)\n" - "> +\t\t\tif (dir = DMA_TO_DEVICE) {\n" + "> -\t\t\tif (dir == DMA_TO_DEVICE)\n" + "> +\t\t\tif (dir == DMA_TO_DEVICE) {\n" "> \t\t\t\tmemcpy(dma_addr, buffer + offset, sz);\n" "> -\t\t\telse\n" "> +\t\t\t\tswiotlb_dma_sync(dma_addr, sz, dir);\n" @@ -124,8 +124,8 @@ "> \t\t\toffset = 0;\n" "> \t\t}\n" "> \t} else {\n" - "> -\t\tif (dir = DMA_TO_DEVICE)\n" - "> +\t\tif (dir = DMA_TO_DEVICE) {\n" + "> -\t\tif (dir == DMA_TO_DEVICE)\n" + "> +\t\tif (dir == DMA_TO_DEVICE) {\n" "> \t\t\tmemcpy(dma_addr, phys_to_virt(phys), size);\n" "> -\t\telse\n" "> +\t\t\tswiotlb_dma_sync(dma_addr, size, dir);\n" @@ -198,4 +198,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > Please read the FAQ at http://www.tux.org/lkml/ -c8ed474f73f7fdd7904ccc7beaf4df0bfb74d530b2497d7f890d93cb9e63cb71 +616e8c64ca822ed52ec46c5594e53257ed672ae2adcbbf8d650fe89680ccd91e
diff --git a/a/1.txt b/N2/1.txt index f4142a4..c7eec6d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -95,8 +95,8 @@ git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git xen-swiotlb > local_irq_save(flags); > buffer = kmap_atomic(pfn_to_page(pfn), > KM_BOUNCE_READ); -> - if (dir = DMA_TO_DEVICE) -> + if (dir = DMA_TO_DEVICE) { +> - if (dir == DMA_TO_DEVICE) +> + if (dir == DMA_TO_DEVICE) { > memcpy(dma_addr, buffer + offset, sz); > - else > + swiotlb_dma_sync(dma_addr, sz, dir); @@ -111,8 +111,8 @@ git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git xen-swiotlb > offset = 0; > } > } else { -> - if (dir = DMA_TO_DEVICE) -> + if (dir = DMA_TO_DEVICE) { +> - if (dir == DMA_TO_DEVICE) +> + if (dir == DMA_TO_DEVICE) { > memcpy(dma_addr, phys_to_virt(phys), size); > - else > + swiotlb_dma_sync(dma_addr, size, dir); diff --git a/a/content_digest b/N2/content_digest index 7288973..b518342 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\01267963912-984-1-git-send-email-albert_herranz@yahoo.es\0" "ref\01267963912-984-5-git-send-email-albert_herranz@yahoo.es\0" "From\0Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>\0" - "Subject\0Re: [LKML] [RFC PATCH v3 04/11] swiotlb: support\0" - "Date\0Mon, 08 Mar 2010 16:55:00 +0000\0" + "Subject\0Re: [LKML] [RFC PATCH v3 04/11] swiotlb: support NOT_COHERENT_CACHE PowerPC platforms\0" + "Date\0Mon, 8 Mar 2010 11:55:00 -0500\0" "To\0Albert Herranz <albert_herranz@yahoo.es>\0" "Cc\0linux-usb@vger.kernel.org" linuxppc-dev@lists.ozlabs.org @@ -108,8 +108,8 @@ "> \t\t\tlocal_irq_save(flags);\n" "> \t\t\tbuffer = kmap_atomic(pfn_to_page(pfn),\n" "> \t\t\t\t\t KM_BOUNCE_READ);\n" - "> -\t\t\tif (dir = DMA_TO_DEVICE)\n" - "> +\t\t\tif (dir = DMA_TO_DEVICE) {\n" + "> -\t\t\tif (dir == DMA_TO_DEVICE)\n" + "> +\t\t\tif (dir == DMA_TO_DEVICE) {\n" "> \t\t\t\tmemcpy(dma_addr, buffer + offset, sz);\n" "> -\t\t\telse\n" "> +\t\t\t\tswiotlb_dma_sync(dma_addr, sz, dir);\n" @@ -124,8 +124,8 @@ "> \t\t\toffset = 0;\n" "> \t\t}\n" "> \t} else {\n" - "> -\t\tif (dir = DMA_TO_DEVICE)\n" - "> +\t\tif (dir = DMA_TO_DEVICE) {\n" + "> -\t\tif (dir == DMA_TO_DEVICE)\n" + "> +\t\tif (dir == DMA_TO_DEVICE) {\n" "> \t\t\tmemcpy(dma_addr, phys_to_virt(phys), size);\n" "> -\t\telse\n" "> +\t\t\tswiotlb_dma_sync(dma_addr, size, dir);\n" @@ -198,4 +198,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > Please read the FAQ at http://www.tux.org/lkml/ -c8ed474f73f7fdd7904ccc7beaf4df0bfb74d530b2497d7f890d93cb9e63cb71 +2c7efd0a8a7d4e6770cb368ec5fb4ed3f664b10bbe6fed44482ec7ecbf591e34
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.