diff for duplicates of <1477666740.31844.9.camel@redhat.com> diff --git a/a/1.txt b/N1/1.txt index b93d4b5..d12ffee 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,60 +11,54 @@ On Mon, 2016-10-24 at 08:05 -0400, Alexander Duyck wrote: Acked-by: Mark Salter <msalter@redhat.com> -> A arch/c6x/kernel/dma.c |A A A 16 +++++++++++----- -> A 1 file changed, 11 insertions(+), 5 deletions(-) +> arch/c6x/kernel/dma.c | 16 +++++++++++----- +> 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/arch/c6x/kernel/dma.c b/arch/c6x/kernel/dma.c > index db4a6a3..d28df74 100644 > --- a/arch/c6x/kernel/dma.c > +++ b/arch/c6x/kernel/dma.c > @@ -42,14 +42,17 @@ static dma_addr_t c6x_dma_map_page(struct device *dev, struct page *page, -> A { -> A dma_addr_t handle = virt_to_phys(page_address(page) + offset); -> A +> { +> dma_addr_t handle = virt_to_phys(page_address(page) + offset); +> > - c6x_dma_sync(handle, size, dir); > + if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) > + c6x_dma_sync(handle, size, dir); > + -> A return handle; -> A } -> A -> A static void c6x_dma_unmap_page(struct device *dev, dma_addr_t handle, -> A size_t size, enum dma_data_direction dir, unsigned long attrs) -> A { +> return handle; +> } +> +> static void c6x_dma_unmap_page(struct device *dev, dma_addr_t handle, +> size_t size, enum dma_data_direction dir, unsigned long attrs) +> { > - c6x_dma_sync(handle, size, dir); > + if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) > + c6x_dma_sync(handle, size, dir); -> A } -> A -> A static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist, +> } +> +> static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist, > @@ -60,7 +63,8 @@ static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist, -> A -> A for_each_sg(sglist, sg, nents, i) { -> A sg->dma_address = sg_phys(sg); +> +> for_each_sg(sglist, sg, nents, i) { +> sg->dma_address = sg_phys(sg); > - c6x_dma_sync(sg->dma_address, sg->length, dir); > + if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) > + c6x_dma_sync(sg->dma_address, sg->length, dir); -> A } -> A -> A return nents; +> } +> +> return nents; > @@ -72,8 +76,10 @@ static void c6x_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, -> A struct scatterlist *sg; -> A int i; -> A +> struct scatterlist *sg; +> int i; +> > - for_each_sg(sglist, sg, nents, i) > - c6x_dma_sync(sg_dma_address(sg), sg->length, dir); > + for_each_sg(sglist, sg, nents, i) { > + if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) > + c6x_dma_sync(sg_dma_address(sg), sg->length, dir); > + } -> A -> A } -> A -> - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> +> +> } +> +> diff --git a/a/content_digest b/N1/content_digest index 0c91eb1..fb751ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -26,62 +26,56 @@ "\n" "Acked-by: Mark Salter <msalter@redhat.com>\n" "\n" - "> A arch/c6x/kernel/dma.c |A A A 16 +++++++++++-----\n" - "> A 1 file changed, 11 insertions(+), 5 deletions(-)\n" + "> \302\240arch/c6x/kernel/dma.c |\302\240\302\240\302\24016 +++++++++++-----\n" + "> \302\2401 file changed, 11 insertions(+), 5 deletions(-)\n" "> \n" "> diff --git a/arch/c6x/kernel/dma.c b/arch/c6x/kernel/dma.c\n" "> index db4a6a3..d28df74 100644\n" "> --- a/arch/c6x/kernel/dma.c\n" "> +++ b/arch/c6x/kernel/dma.c\n" "> @@ -42,14 +42,17 @@ static dma_addr_t c6x_dma_map_page(struct device *dev, struct page *page,\n" - "> A {\n" - "> A \tdma_addr_t handle = virt_to_phys(page_address(page) + offset);\n" - "> A \n" + "> \302\240{\n" + "> \302\240\tdma_addr_t handle = virt_to_phys(page_address(page) + offset);\n" + "> \302\240\n" "> -\tc6x_dma_sync(handle, size, dir);\n" "> +\tif (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))\n" "> +\t\tc6x_dma_sync(handle, size, dir);\n" "> +\n" - "> A \treturn handle;\n" - "> A }\n" - "> A \n" - "> A static void c6x_dma_unmap_page(struct device *dev, dma_addr_t handle,\n" - "> A \t\tsize_t size, enum dma_data_direction dir, unsigned long attrs)\n" - "> A {\n" + "> \302\240\treturn handle;\n" + "> \302\240}\n" + "> \302\240\n" + "> \302\240static void c6x_dma_unmap_page(struct device *dev, dma_addr_t handle,\n" + "> \302\240\t\tsize_t size, enum dma_data_direction dir, unsigned long attrs)\n" + "> \302\240{\n" "> -\tc6x_dma_sync(handle, size, dir);\n" "> +\tif (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))\n" "> +\t\tc6x_dma_sync(handle, size, dir);\n" - "> A }\n" - "> A \n" - "> A static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist,\n" + "> \302\240}\n" + "> \302\240\n" + "> \302\240static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist,\n" "> @@ -60,7 +63,8 @@ static int c6x_dma_map_sg(struct device *dev, struct scatterlist *sglist,\n" - "> A \n" - "> A \tfor_each_sg(sglist, sg, nents, i) {\n" - "> A \t\tsg->dma_address = sg_phys(sg);\n" + "> \302\240\n" + "> \302\240\tfor_each_sg(sglist, sg, nents, i) {\n" + "> \302\240\t\tsg->dma_address = sg_phys(sg);\n" "> -\t\tc6x_dma_sync(sg->dma_address, sg->length, dir);\n" "> +\t\tif (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))\n" "> +\t\t\tc6x_dma_sync(sg->dma_address, sg->length, dir);\n" - "> A \t}\n" - "> A \n" - "> A \treturn nents;\n" + "> \302\240\t}\n" + "> \302\240\n" + "> \302\240\treturn nents;\n" "> @@ -72,8 +76,10 @@ static void c6x_dma_unmap_sg(struct device *dev, struct scatterlist *sglist,\n" - "> A \tstruct scatterlist *sg;\n" - "> A \tint i;\n" - "> A \n" + "> \302\240\tstruct scatterlist *sg;\n" + "> \302\240\tint i;\n" + "> \302\240\n" "> -\tfor_each_sg(sglist, sg, nents, i)\n" "> -\t\tc6x_dma_sync(sg_dma_address(sg), sg->length, dir);\n" "> +\tfor_each_sg(sglist, sg, nents, i) {\n" "> +\t\tif (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))\n" "> +\t\t\tc6x_dma_sync(sg_dma_address(sg), sg->length, dir);\n" "> +\t}\n" - "> A \n" - "> A }\n" - "> A \n" - "> \n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + "> \302\240\n" + "> \302\240}\n" + "> \302\240\n" + > -6e382528e2126f10184152adbdc8be5b394ebc21477ba1f1c61923448cf853ba +38c59d2e248e80bce4ca66440db63bb12a3518b7c4119a9a255299927f1e4fee
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.