diff for duplicates of <56EBF09A.1060503@arm.com> diff --git a/a/1.txt b/N1/1.txt index e6dbad3..a6cfa97 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,7 @@ On 17/03/16 22:02, Sinan Kaya wrote: > - phys_addr_t paddr = dma_to_phys(dev, dma_handle); > + phys_addr_t paddr = swiotlb_dma_to_phys(dev, dma_handle); > -> if (dev = NULL) { +> if (dev == NULL) { > WARN_ONCE(1, "Use an actual device structure for DMA allocation\n"); > @@ -151,7 +151,8 @@ static void *__dma_alloc(struct device *dev, size_t size, > void *addr = __alloc_from_pool(size, &page, flags); diff --git a/a/content_digest b/N1/content_digest index ea4d8fb..4988f6f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -86,7 +86,7 @@ "> -\tphys_addr_t paddr = dma_to_phys(dev, dma_handle);\n" "> +\tphys_addr_t paddr = swiotlb_dma_to_phys(dev, dma_handle);\n" ">\n" - "> \tif (dev = NULL) {\n" + "> \tif (dev == NULL) {\n" "> \t\tWARN_ONCE(1, \"Use an actual device structure for DMA allocation\\n\");\n" "> @@ -151,7 +151,8 @@ static void *__dma_alloc(struct device *dev, size_t size,\n" "> \t\tvoid *addr = __alloc_from_pool(size, &page, flags);\n" @@ -258,4 +258,4 @@ "\n" Robin. -7351751acbfb1a778563db6186ba38a67bbd349e302765731e277cb38bc34636 +b17d092ae94e0ed09ce33eb75026dfcb80f3ad252dd5986169beb0433a67682c
diff --git a/a/1.txt b/N2/1.txt index e6dbad3..a6cfa97 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -34,7 +34,7 @@ On 17/03/16 22:02, Sinan Kaya wrote: > - phys_addr_t paddr = dma_to_phys(dev, dma_handle); > + phys_addr_t paddr = swiotlb_dma_to_phys(dev, dma_handle); > -> if (dev = NULL) { +> if (dev == NULL) { > WARN_ONCE(1, "Use an actual device structure for DMA allocation\n"); > @@ -151,7 +151,8 @@ static void *__dma_alloc(struct device *dev, size_t size, > void *addr = __alloc_from_pool(size, &page, flags); diff --git a/a/content_digest b/N2/content_digest index ea4d8fb..f219116 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,53 +1,9 @@ "ref\01458252137-24497-1-git-send-email-okaya@codeaurora.org\0" "ref\01458252137-24497-2-git-send-email-okaya@codeaurora.org\0" - "From\0Robin Murphy <robin.murphy@arm.com>\0" - "Subject\0Re: [PATCH 2/3] swiotlb: prefix dma_to_phys and phys_to_dma functions\0" + "From\0robin.murphy@arm.com (Robin Murphy)\0" + "Subject\0[PATCH 2/3] swiotlb: prefix dma_to_phys and phys_to_dma functions\0" "Date\0Fri, 18 Mar 2016 12:12:10 +0000\0" - "To\0Sinan Kaya <okaya@codeaurora.org>" - linux-arm-kernel@lists.infradead.org - timur@codeaurora.org - cov@codeaurora.org - " nwatters@codeaurora.org\0" - "Cc\0linux-mips@linux-mips.org" - linux-ia64@vger.kernel.org - linux-xtensa@linux-xtensa.org - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Max Filippov <jcmvbkbc@gmail.com> - Chris Metcalf <cmetcalf@ezchip.com> - Paul Mackerras <paulus@samba.org> - H. Peter Anvin <hpa@zytor.com> - Huacai Chen <chenhc@lemote.com> - Guan Xuetao <gxt@mprc.pku.edu.cn> - Marek Szyprowski <m.szyprowski@samsung.com> - Jisheng Zhang <jszhang@marvell.com> - Florian Fainelli <f.fainelli@gmail.com> - Russell King <linux@arm.linux.org.uk> - Aaro Koskinen <aaro.koskinen@iki.fi> - Michael Ellerman <mpe@ellerman.id.au> - x86@kernel.org - Ingo Molnar <mingo@redhat.com> - Benjamin Herrenschmidt <benh@kernel.crashing.org> - Guenter Roeck <linux@roeck-us.net> - Fenghua Yu <fenghua.yu@intel.com> - Denys Vlasenko <dvlasenk@redhat.com> - Arnd Bergmann <arnd@arndb.de> - Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> - Akinobu Mita <akinobu.mita@gmail.com> - Bjorn Helgaas <bhelgaas@google.com> - Thomas Gleixner <tglx@linutronix.de> - Valentin Rothberg <valentinrothberg@gmail.com> - Chris Zankel <chris@zankel.net> - Tony Luck <tony.luck@intel.com> - linux-pci@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - Dean Nelson <dnelson@redhat.com> - linux-kernel@vger.kernel.org - Ralf Baechle <ralf@linux-mips.org> - Suthikulpanit - Suravee <Suravee.Suthikulpanit@amd.com> - Joe Perches <joe@perches.com> - " Andrew Morton <akpm@linux-foundation.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 17/03/16 22:02, Sinan Kaya wrote:\n" @@ -86,7 +42,7 @@ "> -\tphys_addr_t paddr = dma_to_phys(dev, dma_handle);\n" "> +\tphys_addr_t paddr = swiotlb_dma_to_phys(dev, dma_handle);\n" ">\n" - "> \tif (dev = NULL) {\n" + "> \tif (dev == NULL) {\n" "> \t\tWARN_ONCE(1, \"Use an actual device structure for DMA allocation\\n\");\n" "> @@ -151,7 +151,8 @@ static void *__dma_alloc(struct device *dev, size_t size,\n" "> \t\tvoid *addr = __alloc_from_pool(size, &page, flags);\n" @@ -258,4 +214,4 @@ "\n" Robin. -7351751acbfb1a778563db6186ba38a67bbd349e302765731e277cb38bc34636 +e7228ed8709ba9b39156c5c0fbc618dac1009380445d5e598820fa09a55ef2de
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.