diff for duplicates of <20180420080313.18796-14-hch@lst.de> diff --git a/a/content_digest b/N1/content_digest index 0f6317e..65e777f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,6 @@ "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 13/22] nds32: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:04 +0200\0" - "To\0\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -328,4 +327,4 @@ "-- \n" 2.17.0 -89e6d96b1cde99ae186c6088b24979d1671c58da296367abcac429ab5884eccb +f11869487fddd59f041ad419c100a3d21e5ae26f9df4d8a1f3acc9e492d0bede
diff --git a/a/content_digest b/N2/content_digest index 0f6317e..70c738e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 13/22] nds32: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:04 +0200\0" - "To\0\0" + "To\0unlisted-recipients:; (no To-header on input)\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -328,4 +328,4 @@ "-- \n" 2.17.0 -89e6d96b1cde99ae186c6088b24979d1671c58da296367abcac429ab5884eccb +bf0e7fc15273a011c112e858a5aa6299078a8a05392fba99a01cb091c5d39fc2
diff --git a/a/1.txt b/N3/1.txt index 181a36f..d4404c5 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -7,7 +7,7 @@ or blindly expecting page_address() to work. This makes sure the cache_sync routines is called in the unmap_sg case, to match the unmap_single and sync_{single,sg}_to_cpu cases. -Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Christoph Hellwig <hch at lst.de> --- arch/nds32/Kconfig | 3 + arch/nds32/include/asm/Kbuild | 1 + diff --git a/a/content_digest b/N3/content_digest index 0f6317e..995f0c1 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" - "From\0Christoph Hellwig <hch@lst.de>\0" + "From\0hch@lst.de (Christoph Hellwig)\0" "Subject\0[PATCH 13/22] nds32: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:04 +0200\0" - "To\0\0" - "Cc\0linux-arch@vger.kernel.org" - Michal Simek <monstr@monstr.eu> - Greentime Hu <green.hu@gmail.com> - Vincent Chen <deanbo422@gmail.com> - linux-alpha@vger.kernel.org - linux-snps-arc@lists.infradead.org - linux-arm-kernel@lists.infradead.org - linux-c6x-dev@linux-c6x.org - linux-hexagon@vger.kernel.org - linux-m68k@lists.linux-m68k.org - nios2-dev@lists.rocketboards.org - openrisc@lists.librecores.org - linux-parisc@vger.kernel.org - linux-sh@vger.kernel.org - sparclinux@vger.kernel.org - linux-xtensa@linux-xtensa.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-snps-arc@lists.infradead.org\0" "\00:1\0" "b\0" "Switch to the generic noncoherent direct mapping implementation.\n" @@ -31,7 +14,7 @@ "This makes sure the cache_sync routines is called in the unmap_sg\n" "case, to match the unmap_single and sync_{single,sg}_to_cpu cases.\n" "\n" - "Signed-off-by: Christoph Hellwig <hch@lst.de>\n" + "Signed-off-by: Christoph Hellwig <hch at lst.de>\n" "---\n" " arch/nds32/Kconfig | 3 +\n" " arch/nds32/include/asm/Kbuild | 1 +\n" @@ -328,4 +311,4 @@ "-- \n" 2.17.0 -89e6d96b1cde99ae186c6088b24979d1671c58da296367abcac429ab5884eccb +6af2fac07a72ea37fd56f6d37efe37a3068926c6c56f9930befb4a543a5f98bb
diff --git a/a/1.txt b/N4/1.txt index 181a36f..1de9c65 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -158,7 +158,7 @@ index d291800fc621..688f1a03dee6 100644 - unsigned long start = (unsigned long)vaddr; - unsigned long end = start + size; - -- if (master_type == FOR_CPU) { +- if (master_type = FOR_CPU) { - switch (direction) { - case DMA_TO_DEVICE: - break; @@ -255,8 +255,7 @@ index d291800fc621..688f1a03dee6 100644 - int i; - - for (i = 0; i < nents; i++, sg++) { -- char *virt = -- page_address((struct page *)sg->page_link) + sg->offset; +- char *virt - page_address((struct page *)sg->page_link) + sg->offset; - consistent_sync(virt, sg->length, dir, FOR_CPU); + void *addr = kmap_atomic_pfn(PHYS_PFN(paddr)); + unsigned long start = (unsigned long)addr; @@ -280,8 +279,7 @@ index d291800fc621..688f1a03dee6 100644 - int i; - for (i = 0; i < nents; i++, sg++) { -- char *virt = -- page_address((struct page *)sg->page_link) + sg->offset; +- char *virt - page_address((struct page *)sg->page_link) + sg->offset; - consistent_sync(virt, sg->length, dir, FOR_DEVICE); - } + kunmap_atomic(addr); diff --git a/a/content_digest b/N4/content_digest index 0f6317e..9cbc00a 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,8 +1,7 @@ "ref\020180420080313.18796-1-hch@lst.de\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0[PATCH 13/22] nds32: use generic dma_noncoherent_ops\0" - "Date\0Fri, 20 Apr 2018 10:03:04 +0200\0" - "To\0\0" + "Date\0Fri, 20 Apr 2018 08:03:04 +0000\0" "Cc\0linux-arch@vger.kernel.org" Michal Simek <monstr@monstr.eu> Greentime Hu <green.hu@gmail.com> @@ -182,7 +181,7 @@ "-\tunsigned long start = (unsigned long)vaddr;\n" "-\tunsigned long end = start + size;\n" "-\n" - "-\tif (master_type == FOR_CPU) {\n" + "-\tif (master_type = FOR_CPU) {\n" "-\t\tswitch (direction) {\n" "-\t\tcase DMA_TO_DEVICE:\n" "-\t\t\tbreak;\n" @@ -279,8 +278,7 @@ "-\tint i;\n" "-\n" "-\tfor (i = 0; i < nents; i++, sg++) {\n" - "-\t\tchar *virt =\n" - "-\t\t page_address((struct page *)sg->page_link) + sg->offset;\n" + "-\t\tchar *virt -\t\t page_address((struct page *)sg->page_link) + sg->offset;\n" "-\t\tconsistent_sync(virt, sg->length, dir, FOR_CPU);\n" "+\tvoid *addr = kmap_atomic_pfn(PHYS_PFN(paddr));\n" "+\tunsigned long start = (unsigned long)addr;\n" @@ -304,8 +302,7 @@ "-\tint i;\n" " \n" "-\tfor (i = 0; i < nents; i++, sg++) {\n" - "-\t\tchar *virt =\n" - "-\t\t page_address((struct page *)sg->page_link) + sg->offset;\n" + "-\t\tchar *virt -\t\t page_address((struct page *)sg->page_link) + sg->offset;\n" "-\t\tconsistent_sync(virt, sg->length, dir, FOR_DEVICE);\n" "-\t}\n" "+\tkunmap_atomic(addr);\n" @@ -328,4 +325,4 @@ "-- \n" 2.17.0 -89e6d96b1cde99ae186c6088b24979d1671c58da296367abcac429ab5884eccb +fca04e2cab6655cde0f82142ecdd71d31451bed9a638e2f606f0364ab5c9fb2e
diff --git a/a/content_digest b/N5/content_digest index 0f6317e..8854bca 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" "From\0Christoph Hellwig <hch@lst.de>\0" - "Subject\0[PATCH 13/22] nds32: use generic dma_noncoherent_ops\0" + "Subject\0[OpenRISC] [PATCH 13/22] nds32: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:04 +0200\0" - "To\0\0" - "Cc\0linux-arch@vger.kernel.org" - Michal Simek <monstr@monstr.eu> - Greentime Hu <green.hu@gmail.com> - Vincent Chen <deanbo422@gmail.com> - linux-alpha@vger.kernel.org - linux-snps-arc@lists.infradead.org - linux-arm-kernel@lists.infradead.org - linux-c6x-dev@linux-c6x.org - linux-hexagon@vger.kernel.org - linux-m68k@lists.linux-m68k.org - nios2-dev@lists.rocketboards.org - openrisc@lists.librecores.org - linux-parisc@vger.kernel.org - linux-sh@vger.kernel.org - sparclinux@vger.kernel.org - linux-xtensa@linux-xtensa.org - " linux-kernel@vger.kernel.org\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "Switch to the generic noncoherent direct mapping implementation.\n" @@ -328,4 +311,4 @@ "-- \n" 2.17.0 -89e6d96b1cde99ae186c6088b24979d1671c58da296367abcac429ab5884eccb +392db2120356b7adf6fbf235c339e4e039cbc396b56a3a61cb6f812bba5ad205
diff --git a/a/content_digest b/N6/content_digest index 0f6317e..26aec67 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -1,25 +1,8 @@ "ref\020180420080313.18796-1-hch@lst.de\0" - "From\0Christoph Hellwig <hch@lst.de>\0" + "From\0hch@lst.de (Christoph Hellwig)\0" "Subject\0[PATCH 13/22] nds32: use generic dma_noncoherent_ops\0" "Date\0Fri, 20 Apr 2018 10:03:04 +0200\0" - "To\0\0" - "Cc\0linux-arch@vger.kernel.org" - Michal Simek <monstr@monstr.eu> - Greentime Hu <green.hu@gmail.com> - Vincent Chen <deanbo422@gmail.com> - linux-alpha@vger.kernel.org - linux-snps-arc@lists.infradead.org - linux-arm-kernel@lists.infradead.org - linux-c6x-dev@linux-c6x.org - linux-hexagon@vger.kernel.org - linux-m68k@lists.linux-m68k.org - nios2-dev@lists.rocketboards.org - openrisc@lists.librecores.org - linux-parisc@vger.kernel.org - linux-sh@vger.kernel.org - sparclinux@vger.kernel.org - linux-xtensa@linux-xtensa.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Switch to the generic noncoherent direct mapping implementation.\n" @@ -328,4 +311,4 @@ "-- \n" 2.17.0 -89e6d96b1cde99ae186c6088b24979d1671c58da296367abcac429ab5884eccb +ef728bab9dcaf2bb27b1f5328d5935845f04365eb8145febd6286d848eba9c88
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.