diff for duplicates of <53FCBCC3.5040901@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 84a40b5..7f14d02 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,16 +17,16 @@ On 8/26/2014 3:05 AM, James Hogan wrote: > > This commit in linux-next () breaks the build for metag: > -> drivers/base/dma-mapping.c: In function ‘dma_common_contiguous_remap’: +> drivers/base/dma-mapping.c: In function ?dma_common_contiguous_remap?: > drivers/base/dma-mapping.c:294: error: implicit declaration of -> function ‘dma_common_pages_remap’ +> function ?dma_common_pages_remap? > drivers/base/dma-mapping.c:294: warning: assignment makes pointer from > integer without a cast > drivers/base/dma-mapping.c: At top level: > drivers/base/dma-mapping.c:308: error: conflicting types for -> ‘dma_common_pages_remap’ +> ?dma_common_pages_remap? > drivers/base/dma-mapping.c:294: error: previous implicit declaration -> of ‘dma_common_pages_remap’ was here +> of ?dma_common_pages_remap? was here > > Looks like metag isn't alone either: > @@ -55,7 +55,7 @@ a test (this is theoretical only but I think it should work) -----8<------ -From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001 +>From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001 From: Laura Abbott <lauraa@codeaurora.org> Date: Tue, 26 Aug 2014 09:50:49 -0700 Subject: [PATCH] common: dma-mapping: Swap function order diff --git a/a/content_digest b/N1/content_digest index ddf021b..1aa282d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,10 @@ "ref\01407800431-21566-1-git-send-email-lauraa@codeaurora.org\0" "ref\01407800431-21566-4-git-send-email-lauraa@codeaurora.org\0" "ref\0CAAG0J99=wrz4+c49HeDvL0W9rDZKk2HNLdVtHv4ZJxU4-OjewA@mail.gmail.com\0" - "From\0Laura Abbott <lauraa@codeaurora.org>\0" - "Subject\0Re: [PATCHv7 3/5] common: dma-mapping: Introduce common remapping functions\0" + "From\0lauraa@codeaurora.org (Laura Abbott)\0" + "Subject\0[PATCHv7 3/5] common: dma-mapping: Introduce common remapping functions\0" "Date\0Tue, 26 Aug 2014 09:58:43 -0700\0" - "To\0James Hogan <james.hogan@imgtec.com>" - Catalin Marinas <catalin.marinas@arm.com> - " Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0Will Deacon <will.deacon@arm.com>" - Russell King <linux@arm.linux.org.uk> - David Riley <davidriley@chromium.org> - ARM Kernel List <linux-arm-kernel@lists.infradead.org> - Ritesh Harjain <ritesh.harjani@gmail.com> - linux-mm <linux-mm@kvack.org> - LKML <linux-kernel@vger.kernel.org> - Thierry Reding <thierry.reding@gmail.com> - Arnd Bergmann <arnd@arndb.de> - " linux-next@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 8/26/2014 3:05 AM, James Hogan wrote:\n" @@ -38,16 +26,16 @@ "> \n" "> This commit in linux-next () breaks the build for metag:\n" "> \n" - "> drivers/base/dma-mapping.c: In function \342\200\230dma_common_contiguous_remap\342\200\231:\n" + "> drivers/base/dma-mapping.c: In function ?dma_common_contiguous_remap?:\n" "> drivers/base/dma-mapping.c:294: error: implicit declaration of\n" - "> function \342\200\230dma_common_pages_remap\342\200\231\n" + "> function ?dma_common_pages_remap?\n" "> drivers/base/dma-mapping.c:294: warning: assignment makes pointer from\n" "> integer without a cast\n" "> drivers/base/dma-mapping.c: At top level:\n" "> drivers/base/dma-mapping.c:308: error: conflicting types for\n" - "> \342\200\230dma_common_pages_remap\342\200\231\n" + "> ?dma_common_pages_remap?\n" "> drivers/base/dma-mapping.c:294: error: previous implicit declaration\n" - "> of \342\200\230dma_common_pages_remap\342\200\231 was here\n" + "> of ?dma_common_pages_remap? was here\n" "> \n" "> Looks like metag isn't alone either:\n" "> \n" @@ -76,7 +64,7 @@ "\n" "-----8<------\n" "\n" - "From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001\n" + ">From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001\n" "From: Laura Abbott <lauraa@codeaurora.org>\n" "Date: Tue, 26 Aug 2014 09:50:49 -0700\n" "Subject: [PATCH] common: dma-mapping: Swap function order\n" @@ -173,4 +161,4 @@ "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" hosted by The Linux Foundation -704e3e12971e0a596e52084743a775dcdf235e406367c2e038cd15a34e70468b +867192fe8303fd3876677263980b5576b055c251d2a8bea074cc085002c5a40c
diff --git a/a/1.txt b/N2/1.txt index 84a40b5..4c0afcb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,16 +17,16 @@ On 8/26/2014 3:05 AM, James Hogan wrote: > > This commit in linux-next () breaks the build for metag: > -> drivers/base/dma-mapping.c: In function ‘dma_common_contiguous_remap’: +> drivers/base/dma-mapping.c: In function a??dma_common_contiguous_remapa??: > drivers/base/dma-mapping.c:294: error: implicit declaration of -> function ‘dma_common_pages_remap’ +> function a??dma_common_pages_remapa?? > drivers/base/dma-mapping.c:294: warning: assignment makes pointer from > integer without a cast > drivers/base/dma-mapping.c: At top level: > drivers/base/dma-mapping.c:308: error: conflicting types for -> ‘dma_common_pages_remap’ +> a??dma_common_pages_remapa?? > drivers/base/dma-mapping.c:294: error: previous implicit declaration -> of ‘dma_common_pages_remap’ was here +> of a??dma_common_pages_remapa?? was here > > Looks like metag isn't alone either: > @@ -54,100 +54,3 @@ Thanks for the report. Would you mind giving the following patch a test (this is theoretical only but I think it should work) -----8<------ - -From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001 -From: Laura Abbott <lauraa@codeaurora.org> -Date: Tue, 26 Aug 2014 09:50:49 -0700 -Subject: [PATCH] common: dma-mapping: Swap function order - -Fix the order of dma_common_contiguous_remap and -dma_common_pages_remap to avoid function declaration errors: - -drivers/base/dma-mapping.c: In function 'dma_common_contiguous_remap': -drivers/base/dma-mapping.c:294: error: implicit declaration of -function 'dma_common_pages_remap' -drivers/base/dma-mapping.c:294: warning: assignment makes pointer from -integer without a cast -drivers/base/dma-mapping.c: At top level: -drivers/base/dma-mapping.c:308: error: conflicting types for -'dma_common_pages_remap' -drivers/base/dma-mapping.c:294: error: previous implicit declaration -of 'dma_common_pages_remap' was here - -Change-Id: I65db739114e8f5816a24a279a2ff1a6dc92e2b83 -Reported-by: James Hogan <james.hogan@imgtec.com> -Reported-by: kbuild test robot <fengguang.wu@intel.com> -Signed-off-by: Laura Abbott <lauraa@codeaurora.org> ---- - drivers/base/dma-mapping.c | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c -index 1bc46df..056fd46 100644 ---- a/drivers/base/dma-mapping.c -+++ b/drivers/base/dma-mapping.c -@@ -271,6 +271,28 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, - EXPORT_SYMBOL(dma_common_mmap); - - /* -+ * remaps an array of PAGE_SIZE pages into another vm_area -+ * Cannot be used in non-sleeping contexts -+ */ -+void *dma_common_pages_remap(struct page **pages, size_t size, -+ unsigned long vm_flags, pgprot_t prot, -+ const void *caller) -+{ -+ struct vm_struct *area; -+ -+ area = get_vm_area_caller(size, vm_flags, caller); -+ if (!area) -+ return NULL; -+ -+ if (map_vm_area(area, prot, pages)) { -+ vunmap(area->addr); -+ return NULL; -+ } -+ -+ return area->addr; -+} -+ -+/* - * remaps an allocated contiguous region into another vm_area. - * Cannot be used in non-sleeping contexts - */ -@@ -299,28 +321,6 @@ void *dma_common_contiguous_remap(struct page *page, size_t size, - } - - /* -- * remaps an array of PAGE_SIZE pages into another vm_area -- * Cannot be used in non-sleeping contexts -- */ --void *dma_common_pages_remap(struct page **pages, size_t size, -- unsigned long vm_flags, pgprot_t prot, -- const void *caller) --{ -- struct vm_struct *area; -- -- area = get_vm_area_caller(size, vm_flags, caller); -- if (!area) -- return NULL; -- -- if (map_vm_area(area, prot, pages)) { -- vunmap(area->addr); -- return NULL; -- } -- -- return area->addr; --} -- --/* - * unmaps a range previously mapped by dma_common_*_remap - */ - void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags) --- -The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, -hosted by The Linux Foundation - --- -Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, -hosted by The Linux Foundation diff --git a/a/content_digest b/N2/content_digest index ddf021b..46ec2e4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -38,16 +38,16 @@ "> \n" "> This commit in linux-next () breaks the build for metag:\n" "> \n" - "> drivers/base/dma-mapping.c: In function \342\200\230dma_common_contiguous_remap\342\200\231:\n" + "> drivers/base/dma-mapping.c: In function a??dma_common_contiguous_remapa??:\n" "> drivers/base/dma-mapping.c:294: error: implicit declaration of\n" - "> function \342\200\230dma_common_pages_remap\342\200\231\n" + "> function a??dma_common_pages_remapa??\n" "> drivers/base/dma-mapping.c:294: warning: assignment makes pointer from\n" "> integer without a cast\n" "> drivers/base/dma-mapping.c: At top level:\n" "> drivers/base/dma-mapping.c:308: error: conflicting types for\n" - "> \342\200\230dma_common_pages_remap\342\200\231\n" + "> a??dma_common_pages_remapa??\n" "> drivers/base/dma-mapping.c:294: error: previous implicit declaration\n" - "> of \342\200\230dma_common_pages_remap\342\200\231 was here\n" + "> of a??dma_common_pages_remapa?? was here\n" "> \n" "> Looks like metag isn't alone either:\n" "> \n" @@ -74,103 +74,6 @@ "Thanks for the report. Would you mind giving the following patch\n" "a test (this is theoretical only but I think it should work)\n" "\n" - "-----8<------\n" - "\n" - "From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001\n" - "From: Laura Abbott <lauraa@codeaurora.org>\n" - "Date: Tue, 26 Aug 2014 09:50:49 -0700\n" - "Subject: [PATCH] common: dma-mapping: Swap function order\n" - "\n" - "Fix the order of dma_common_contiguous_remap and\n" - "dma_common_pages_remap to avoid function declaration errors:\n" - "\n" - "drivers/base/dma-mapping.c: In function 'dma_common_contiguous_remap':\n" - "drivers/base/dma-mapping.c:294: error: implicit declaration of\n" - "function 'dma_common_pages_remap'\n" - "drivers/base/dma-mapping.c:294: warning: assignment makes pointer from\n" - "integer without a cast\n" - "drivers/base/dma-mapping.c: At top level:\n" - "drivers/base/dma-mapping.c:308: error: conflicting types for\n" - "'dma_common_pages_remap'\n" - "drivers/base/dma-mapping.c:294: error: previous implicit declaration\n" - "of 'dma_common_pages_remap' was here\n" - "\n" - "Change-Id: I65db739114e8f5816a24a279a2ff1a6dc92e2b83\n" - "Reported-by: James Hogan <james.hogan@imgtec.com>\n" - "Reported-by: kbuild test robot <fengguang.wu@intel.com>\n" - "Signed-off-by: Laura Abbott <lauraa@codeaurora.org>\n" - "---\n" - " drivers/base/dma-mapping.c | 44 ++++++++++++++++++++++----------------------\n" - " 1 file changed, 22 insertions(+), 22 deletions(-)\n" - "\n" - "diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c\n" - "index 1bc46df..056fd46 100644\n" - "--- a/drivers/base/dma-mapping.c\n" - "+++ b/drivers/base/dma-mapping.c\n" - "@@ -271,6 +271,28 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,\n" - " EXPORT_SYMBOL(dma_common_mmap);\n" - " \n" - " /*\n" - "+ * remaps an array of PAGE_SIZE pages into another vm_area\n" - "+ * Cannot be used in non-sleeping contexts\n" - "+ */\n" - "+void *dma_common_pages_remap(struct page **pages, size_t size,\n" - "+\t\t\tunsigned long vm_flags, pgprot_t prot,\n" - "+\t\t\tconst void *caller)\n" - "+{\n" - "+\tstruct vm_struct *area;\n" - "+\n" - "+\tarea = get_vm_area_caller(size, vm_flags, caller);\n" - "+\tif (!area)\n" - "+\t\treturn NULL;\n" - "+\n" - "+\tif (map_vm_area(area, prot, pages)) {\n" - "+\t\tvunmap(area->addr);\n" - "+\t\treturn NULL;\n" - "+\t}\n" - "+\n" - "+\treturn area->addr;\n" - "+}\n" - "+\n" - "+/*\n" - " * remaps an allocated contiguous region into another vm_area.\n" - " * Cannot be used in non-sleeping contexts\n" - " */\n" - "@@ -299,28 +321,6 @@ void *dma_common_contiguous_remap(struct page *page, size_t size,\n" - " }\n" - " \n" - " /*\n" - "- * remaps an array of PAGE_SIZE pages into another vm_area\n" - "- * Cannot be used in non-sleeping contexts\n" - "- */\n" - "-void *dma_common_pages_remap(struct page **pages, size_t size,\n" - "-\t\t\tunsigned long vm_flags, pgprot_t prot,\n" - "-\t\t\tconst void *caller)\n" - "-{\n" - "-\tstruct vm_struct *area;\n" - "-\n" - "-\tarea = get_vm_area_caller(size, vm_flags, caller);\n" - "-\tif (!area)\n" - "-\t\treturn NULL;\n" - "-\n" - "-\tif (map_vm_area(area, prot, pages)) {\n" - "-\t\tvunmap(area->addr);\n" - "-\t\treturn NULL;\n" - "-\t}\n" - "-\n" - "-\treturn area->addr;\n" - "-}\n" - "-\n" - "-/*\n" - " * unmaps a range previously mapped by dma_common_*_remap\n" - " */\n" - " void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags)\n" - "-- \n" - "The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\n" - "hosted by The Linux Foundation\n" - "\n" - "-- \n" - "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" - hosted by The Linux Foundation + -----8<------ -704e3e12971e0a596e52084743a775dcdf235e406367c2e038cd15a34e70468b +82afaa8781bbcc5d790b20c790401e7c81bb24125ed7bcc100838979d4f77342
diff --git a/a/1.txt b/N3/1.txt index 84a40b5..d985615 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -55,7 +55,7 @@ a test (this is theoretical only but I think it should work) -----8<------ -From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001 +>From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001 From: Laura Abbott <lauraa@codeaurora.org> Date: Tue, 26 Aug 2014 09:50:49 -0700 Subject: [PATCH] common: dma-mapping: Swap function order diff --git a/a/content_digest b/N3/content_digest index ddf021b..c078f18 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -76,7 +76,7 @@ "\n" "-----8<------\n" "\n" - "From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001\n" + ">From 81c9a5504cbc1d72ff1df084d48502b248cd79d0 Mon Sep 17 00:00:00 2001\n" "From: Laura Abbott <lauraa@codeaurora.org>\n" "Date: Tue, 26 Aug 2014 09:50:49 -0700\n" "Subject: [PATCH] common: dma-mapping: Swap function order\n" @@ -173,4 +173,4 @@ "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" hosted by The Linux Foundation -704e3e12971e0a596e52084743a775dcdf235e406367c2e038cd15a34e70468b +61cf870f088f8a02dde0fe903972277f8fcbeaf3da828fe07f2b796a3cbc2f86
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.