diff for duplicates of <20180420080313.18796-10-hch@lst.de>
diff --git a/a/1.txt b/N1/1.txt
index 1aa1278..07ca107 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -169,7 +169,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- struct scatterlist *s;
- int i;
-
-- WARN_ON(nents = 0 || sg[0].length = 0);
+- WARN_ON(nents == 0 || sg[0].length == 0);
-
- for_each_sg(sg, s, nents, i) {
- s->dma_address = sg_phys(s);
@@ -228,7 +228,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- unsigned long attrs)
-{
- dma_addr_t bus = page_to_phys(page) + offset;
-- WARN_ON(size = 0);
+- WARN_ON(size == 0);
-
- if (!check_addr("map_single", dev, bus, size))
- return HEXAGON_MAPPING_ERROR;
@@ -255,7 +255,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
-
-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-- return dma_addr = HEXAGON_MAPPING_ERROR;
+- return dma_addr == HEXAGON_MAPPING_ERROR;
-}
-
-const struct dma_map_ops hexagon_dma_ops = {
diff --git a/a/content_digest b/N1/content_digest
index c6a3e9b..efd1156 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,10 @@
"Subject\0[PATCH 09/22] hexagon: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:00 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:00 +0200\0"
+]
+[
+ "To\0unlisted-recipients:; (no To-header on input)\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -207,7 +210,7 @@
"-\tstruct scatterlist *s;\n",
"-\tint i;\n",
"-\n",
- "-\tWARN_ON(nents = 0 || sg[0].length = 0);\n",
+ "-\tWARN_ON(nents == 0 || sg[0].length == 0);\n",
"-\n",
"-\tfor_each_sg(sg, s, nents, i) {\n",
"-\t\ts->dma_address = sg_phys(s);\n",
@@ -266,7 +269,7 @@
"-\t\t\t\t unsigned long attrs)\n",
"-{\n",
"-\tdma_addr_t bus = page_to_phys(page) + offset;\n",
- "-\tWARN_ON(size = 0);\n",
+ "-\tWARN_ON(size == 0);\n",
"-\n",
"-\tif (!check_addr(\"map_single\", dev, bus, size))\n",
"-\t\treturn HEXAGON_MAPPING_ERROR;\n",
@@ -293,7 +296,7 @@
"-\n",
"-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
"-{\n",
- "-\treturn dma_addr = HEXAGON_MAPPING_ERROR;\n",
+ "-\treturn dma_addr == HEXAGON_MAPPING_ERROR;\n",
"-}\n",
"-\n",
"-const struct dma_map_ops hexagon_dma_ops = {\n",
@@ -317,4 +320,4 @@
"2.17.0"
]
-50c695c0bb1329c640e07e25065a48c6023dc26cdc06074a14547b7aad4226d2
+7548606d5b87a63fe656f0acd1b077d26260b497e8c94d93131df8ad5e242fb6
diff --git a/a/1.txt b/N2/1.txt
index 1aa1278..07ca107 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -169,7 +169,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- struct scatterlist *s;
- int i;
-
-- WARN_ON(nents = 0 || sg[0].length = 0);
+- WARN_ON(nents == 0 || sg[0].length == 0);
-
- for_each_sg(sg, s, nents, i) {
- s->dma_address = sg_phys(s);
@@ -228,7 +228,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- unsigned long attrs)
-{
- dma_addr_t bus = page_to_phys(page) + offset;
-- WARN_ON(size = 0);
+- WARN_ON(size == 0);
-
- if (!check_addr("map_single", dev, bus, size))
- return HEXAGON_MAPPING_ERROR;
@@ -255,7 +255,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
-
-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-- return dma_addr = HEXAGON_MAPPING_ERROR;
+- return dma_addr == HEXAGON_MAPPING_ERROR;
-}
-
-const struct dma_map_ops hexagon_dma_ops = {
diff --git a/a/content_digest b/N2/content_digest
index c6a3e9b..a45116c 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,10 @@
"Subject\0[PATCH 09/22] hexagon: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:00 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:00 +0200\0"
+]
+[
+ "To\0unlisted-recipients:; (no To-header on input)\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -20,7 +23,7 @@
" linux-arm-kernel\@lists.infradead.org",
" linux-c6x-dev\@linux-c6x.org",
" linux-hexagon\@vger.kernel.org",
- " linux-m68k\@lists.linux-m68k.org",
+ " linux-m68k\@vger.kernel.org",
" nios2-dev\@lists.rocketboards.org",
" openrisc\@lists.librecores.org",
" linux-parisc\@vger.kernel.org",
@@ -207,7 +210,7 @@
"-\tstruct scatterlist *s;\n",
"-\tint i;\n",
"-\n",
- "-\tWARN_ON(nents = 0 || sg[0].length = 0);\n",
+ "-\tWARN_ON(nents == 0 || sg[0].length == 0);\n",
"-\n",
"-\tfor_each_sg(sg, s, nents, i) {\n",
"-\t\ts->dma_address = sg_phys(s);\n",
@@ -266,7 +269,7 @@
"-\t\t\t\t unsigned long attrs)\n",
"-{\n",
"-\tdma_addr_t bus = page_to_phys(page) + offset;\n",
- "-\tWARN_ON(size = 0);\n",
+ "-\tWARN_ON(size == 0);\n",
"-\n",
"-\tif (!check_addr(\"map_single\", dev, bus, size))\n",
"-\t\treturn HEXAGON_MAPPING_ERROR;\n",
@@ -293,7 +296,7 @@
"-\n",
"-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
"-{\n",
- "-\treturn dma_addr = HEXAGON_MAPPING_ERROR;\n",
+ "-\treturn dma_addr == HEXAGON_MAPPING_ERROR;\n",
"-}\n",
"-\n",
"-const struct dma_map_ops hexagon_dma_ops = {\n",
@@ -317,4 +320,4 @@
"2.17.0"
]
-50c695c0bb1329c640e07e25065a48c6023dc26cdc06074a14547b7aad4226d2
+ea0e8a7b1e31c9309c80e11035d8634eb1ae1f8741ca2eb76996b1e2c447ead9
diff --git a/a/1.txt b/N3/1.txt
index 1aa1278..07ca107 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -169,7 +169,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- struct scatterlist *s;
- int i;
-
-- WARN_ON(nents = 0 || sg[0].length = 0);
+- WARN_ON(nents == 0 || sg[0].length == 0);
-
- for_each_sg(sg, s, nents, i) {
- s->dma_address = sg_phys(s);
@@ -228,7 +228,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- unsigned long attrs)
-{
- dma_addr_t bus = page_to_phys(page) + offset;
-- WARN_ON(size = 0);
+- WARN_ON(size == 0);
-
- if (!check_addr("map_single", dev, bus, size))
- return HEXAGON_MAPPING_ERROR;
@@ -255,7 +255,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
-
-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-- return dma_addr = HEXAGON_MAPPING_ERROR;
+- return dma_addr == HEXAGON_MAPPING_ERROR;
-}
-
-const struct dma_map_ops hexagon_dma_ops = {
diff --git a/a/content_digest b/N3/content_digest
index c6a3e9b..a6e3469 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 09/22] hexagon: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:00 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:00 +0200\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -207,7 +207,7 @@
"-\tstruct scatterlist *s;\n",
"-\tint i;\n",
"-\n",
- "-\tWARN_ON(nents = 0 || sg[0].length = 0);\n",
+ "-\tWARN_ON(nents == 0 || sg[0].length == 0);\n",
"-\n",
"-\tfor_each_sg(sg, s, nents, i) {\n",
"-\t\ts->dma_address = sg_phys(s);\n",
@@ -266,7 +266,7 @@
"-\t\t\t\t unsigned long attrs)\n",
"-{\n",
"-\tdma_addr_t bus = page_to_phys(page) + offset;\n",
- "-\tWARN_ON(size = 0);\n",
+ "-\tWARN_ON(size == 0);\n",
"-\n",
"-\tif (!check_addr(\"map_single\", dev, bus, size))\n",
"-\t\treturn HEXAGON_MAPPING_ERROR;\n",
@@ -293,7 +293,7 @@
"-\n",
"-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
"-{\n",
- "-\treturn dma_addr = HEXAGON_MAPPING_ERROR;\n",
+ "-\treturn dma_addr == HEXAGON_MAPPING_ERROR;\n",
"-}\n",
"-\n",
"-const struct dma_map_ops hexagon_dma_ops = {\n",
@@ -317,4 +317,4 @@
"2.17.0"
]
-50c695c0bb1329c640e07e25065a48c6023dc26cdc06074a14547b7aad4226d2
+9e6ba4ece5d1c1865ddaa78f684d40e8629bf38c6c63320f6fb6182035e858de
diff --git a/a/1.txt b/N4/1.txt
index 1aa1278..d33134c 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -7,7 +7,7 @@ important unmap_single case.
This adds the previously missing sync_sg_for_device implementation that
matches the pre-existing sync_single_for_device implementation.
-Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Christoph Hellwig <hch at lst.de>
---
arch/hexagon/Kconfig | 2 +
arch/hexagon/include/asm/Kbuild | 1 +
@@ -169,7 +169,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- struct scatterlist *s;
- int i;
-
-- WARN_ON(nents = 0 || sg[0].length = 0);
+- WARN_ON(nents == 0 || sg[0].length == 0);
-
- for_each_sg(sg, s, nents, i) {
- s->dma_address = sg_phys(s);
@@ -228,7 +228,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- unsigned long attrs)
-{
- dma_addr_t bus = page_to_phys(page) + offset;
-- WARN_ON(size = 0);
+- WARN_ON(size == 0);
-
- if (!check_addr("map_single", dev, bus, size))
- return HEXAGON_MAPPING_ERROR;
@@ -255,7 +255,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
-
-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-- return dma_addr = HEXAGON_MAPPING_ERROR;
+- return dma_addr == HEXAGON_MAPPING_ERROR;
-}
-
-const struct dma_map_ops hexagon_dma_ops = {
diff --git a/a/content_digest b/N4/content_digest
index c6a3e9b..d01ed58 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -2,32 +2,16 @@
"ref\00020180420080313.18796-1-hch\@lst.de\0"
]
[
- "From\0Christoph Hellwig <hch\@lst.de>\0"
+ "From\0hch\@lst.de (Christoph Hellwig)\0"
]
[
"Subject\0[PATCH 09/22] hexagon: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:00 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:00 +0200\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"
]
[
"\0000:1\0"
@@ -45,7 +29,7 @@
"This adds the previously missing sync_sg_for_device implementation that\n",
"matches the pre-existing sync_single_for_device implementation.\n",
"\n",
- "Signed-off-by: Christoph Hellwig <hch\@lst.de>\n",
+ "Signed-off-by: Christoph Hellwig <hch at lst.de>\n",
"---\n",
" arch/hexagon/Kconfig | 2 +\n",
" arch/hexagon/include/asm/Kbuild | 1 +\n",
@@ -207,7 +191,7 @@
"-\tstruct scatterlist *s;\n",
"-\tint i;\n",
"-\n",
- "-\tWARN_ON(nents = 0 || sg[0].length = 0);\n",
+ "-\tWARN_ON(nents == 0 || sg[0].length == 0);\n",
"-\n",
"-\tfor_each_sg(sg, s, nents, i) {\n",
"-\t\ts->dma_address = sg_phys(s);\n",
@@ -266,7 +250,7 @@
"-\t\t\t\t unsigned long attrs)\n",
"-{\n",
"-\tdma_addr_t bus = page_to_phys(page) + offset;\n",
- "-\tWARN_ON(size = 0);\n",
+ "-\tWARN_ON(size == 0);\n",
"-\n",
"-\tif (!check_addr(\"map_single\", dev, bus, size))\n",
"-\t\treturn HEXAGON_MAPPING_ERROR;\n",
@@ -293,7 +277,7 @@
"-\n",
"-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
"-{\n",
- "-\treturn dma_addr = HEXAGON_MAPPING_ERROR;\n",
+ "-\treturn dma_addr == HEXAGON_MAPPING_ERROR;\n",
"-}\n",
"-\n",
"-const struct dma_map_ops hexagon_dma_ops = {\n",
@@ -317,4 +301,4 @@
"2.17.0"
]
-50c695c0bb1329c640e07e25065a48c6023dc26cdc06074a14547b7aad4226d2
+105b4cd36c326d7bd00ef2b3ea432e8ca16012336cbcbc17d31d43038a93d02a
diff --git a/a/1.txt b/N5/1.txt
index 1aa1278..07ca107 100644
--- a/a/1.txt
+++ b/N5/1.txt
@@ -169,7 +169,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- struct scatterlist *s;
- int i;
-
-- WARN_ON(nents = 0 || sg[0].length = 0);
+- WARN_ON(nents == 0 || sg[0].length == 0);
-
- for_each_sg(sg, s, nents, i) {
- s->dma_address = sg_phys(s);
@@ -228,7 +228,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- unsigned long attrs)
-{
- dma_addr_t bus = page_to_phys(page) + offset;
-- WARN_ON(size = 0);
+- WARN_ON(size == 0);
-
- if (!check_addr("map_single", dev, bus, size))
- return HEXAGON_MAPPING_ERROR;
@@ -255,7 +255,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
-
-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-- return dma_addr = HEXAGON_MAPPING_ERROR;
+- return dma_addr == HEXAGON_MAPPING_ERROR;
-}
-
-const struct dma_map_ops hexagon_dma_ops = {
diff --git a/a/content_digest b/N5/content_digest
index c6a3e9b..1b79e66 100644
--- a/a/content_digest
+++ b/N5/content_digest
@@ -2,32 +2,16 @@
"ref\00020180420080313.18796-1-hch\@lst.de\0"
]
[
- "From\0Christoph Hellwig <hch\@lst.de>\0"
+ "From\0hch\@lst.de (Christoph Hellwig)\0"
]
[
"Subject\0[PATCH 09/22] hexagon: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:00 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:00 +0200\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"
]
[
"\0000:1\0"
@@ -207,7 +191,7 @@
"-\tstruct scatterlist *s;\n",
"-\tint i;\n",
"-\n",
- "-\tWARN_ON(nents = 0 || sg[0].length = 0);\n",
+ "-\tWARN_ON(nents == 0 || sg[0].length == 0);\n",
"-\n",
"-\tfor_each_sg(sg, s, nents, i) {\n",
"-\t\ts->dma_address = sg_phys(s);\n",
@@ -266,7 +250,7 @@
"-\t\t\t\t unsigned long attrs)\n",
"-{\n",
"-\tdma_addr_t bus = page_to_phys(page) + offset;\n",
- "-\tWARN_ON(size = 0);\n",
+ "-\tWARN_ON(size == 0);\n",
"-\n",
"-\tif (!check_addr(\"map_single\", dev, bus, size))\n",
"-\t\treturn HEXAGON_MAPPING_ERROR;\n",
@@ -293,7 +277,7 @@
"-\n",
"-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
"-{\n",
- "-\treturn dma_addr = HEXAGON_MAPPING_ERROR;\n",
+ "-\treturn dma_addr == HEXAGON_MAPPING_ERROR;\n",
"-}\n",
"-\n",
"-const struct dma_map_ops hexagon_dma_ops = {\n",
@@ -317,4 +301,4 @@
"2.17.0"
]
-50c695c0bb1329c640e07e25065a48c6023dc26cdc06074a14547b7aad4226d2
+625e5bab9e7668e69439cf0603f875c84bdeabedb624ce0be3c1bcda91ac6295
diff --git a/a/1.txt b/N6/1.txt
index 1aa1278..07ca107 100644
--- a/a/1.txt
+++ b/N6/1.txt
@@ -169,7 +169,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- struct scatterlist *s;
- int i;
-
-- WARN_ON(nents = 0 || sg[0].length = 0);
+- WARN_ON(nents == 0 || sg[0].length == 0);
-
- for_each_sg(sg, s, nents, i) {
- s->dma_address = sg_phys(s);
@@ -228,7 +228,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- unsigned long attrs)
-{
- dma_addr_t bus = page_to_phys(page) + offset;
-- WARN_ON(size = 0);
+- WARN_ON(size == 0);
-
- if (!check_addr("map_single", dev, bus, size))
- return HEXAGON_MAPPING_ERROR;
@@ -255,7 +255,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
-
-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-- return dma_addr = HEXAGON_MAPPING_ERROR;
+- return dma_addr == HEXAGON_MAPPING_ERROR;
-}
-
-const struct dma_map_ops hexagon_dma_ops = {
diff --git a/a/content_digest b/N6/content_digest
index c6a3e9b..f40fa57 100644
--- a/a/content_digest
+++ b/N6/content_digest
@@ -5,29 +5,13 @@
"From\0Christoph Hellwig <hch\@lst.de>\0"
]
[
- "Subject\0[PATCH 09/22] hexagon: use generic dma_noncoherent_ops\0"
+ "Subject\0[OpenRISC] [PATCH 09/22] hexagon: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:00 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:00 +0200\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"
]
[
"\0000:1\0"
@@ -207,7 +191,7 @@
"-\tstruct scatterlist *s;\n",
"-\tint i;\n",
"-\n",
- "-\tWARN_ON(nents = 0 || sg[0].length = 0);\n",
+ "-\tWARN_ON(nents == 0 || sg[0].length == 0);\n",
"-\n",
"-\tfor_each_sg(sg, s, nents, i) {\n",
"-\t\ts->dma_address = sg_phys(s);\n",
@@ -266,7 +250,7 @@
"-\t\t\t\t unsigned long attrs)\n",
"-{\n",
"-\tdma_addr_t bus = page_to_phys(page) + offset;\n",
- "-\tWARN_ON(size = 0);\n",
+ "-\tWARN_ON(size == 0);\n",
"-\n",
"-\tif (!check_addr(\"map_single\", dev, bus, size))\n",
"-\t\treturn HEXAGON_MAPPING_ERROR;\n",
@@ -293,7 +277,7 @@
"-\n",
"-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
"-{\n",
- "-\treturn dma_addr = HEXAGON_MAPPING_ERROR;\n",
+ "-\treturn dma_addr == HEXAGON_MAPPING_ERROR;\n",
"-}\n",
"-\n",
"-const struct dma_map_ops hexagon_dma_ops = {\n",
@@ -317,4 +301,4 @@
"2.17.0"
]
-50c695c0bb1329c640e07e25065a48c6023dc26cdc06074a14547b7aad4226d2
+3041a99714e4c54fd1aa1c78b9131bbc59db8b4ca1654acd4faeadc6bc0dd546
diff --git a/a/1.txt b/N7/1.txt
index 1aa1278..07ca107 100644
--- a/a/1.txt
+++ b/N7/1.txt
@@ -169,7 +169,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- struct scatterlist *s;
- int i;
-
-- WARN_ON(nents = 0 || sg[0].length = 0);
+- WARN_ON(nents == 0 || sg[0].length == 0);
-
- for_each_sg(sg, s, nents, i) {
- s->dma_address = sg_phys(s);
@@ -228,7 +228,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
- unsigned long attrs)
-{
- dma_addr_t bus = page_to_phys(page) + offset;
-- WARN_ON(size = 0);
+- WARN_ON(size == 0);
-
- if (!check_addr("map_single", dev, bus, size))
- return HEXAGON_MAPPING_ERROR;
@@ -255,7 +255,7 @@ index 77459df34e2e..ffc4ae8e126f 100644
-
-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-- return dma_addr = HEXAGON_MAPPING_ERROR;
+- return dma_addr == HEXAGON_MAPPING_ERROR;
-}
-
-const struct dma_map_ops hexagon_dma_ops = {
diff --git a/a/content_digest b/N7/content_digest
index c6a3e9b..7e15760 100644
--- a/a/content_digest
+++ b/N7/content_digest
@@ -8,7 +8,10 @@
"Subject\0[PATCH 09/22] hexagon: use generic dma_noncoherent_ops\0"
]
[
- "Date\0Fri, 20 Apr 2018 08:03:00 +0000\0"
+ "Date\0Fri, 20 Apr 2018 10:03:00 +0200\0"
+]
+[
+ "To\0\0"
]
[
"Cc\0linux-arch\@vger.kernel.org",
@@ -207,7 +210,7 @@
"-\tstruct scatterlist *s;\n",
"-\tint i;\n",
"-\n",
- "-\tWARN_ON(nents = 0 || sg[0].length = 0);\n",
+ "-\tWARN_ON(nents == 0 || sg[0].length == 0);\n",
"-\n",
"-\tfor_each_sg(sg, s, nents, i) {\n",
"-\t\ts->dma_address = sg_phys(s);\n",
@@ -266,7 +269,7 @@
"-\t\t\t\t unsigned long attrs)\n",
"-{\n",
"-\tdma_addr_t bus = page_to_phys(page) + offset;\n",
- "-\tWARN_ON(size = 0);\n",
+ "-\tWARN_ON(size == 0);\n",
"-\n",
"-\tif (!check_addr(\"map_single\", dev, bus, size))\n",
"-\t\treturn HEXAGON_MAPPING_ERROR;\n",
@@ -293,7 +296,7 @@
"-\n",
"-static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
"-{\n",
- "-\treturn dma_addr = HEXAGON_MAPPING_ERROR;\n",
+ "-\treturn dma_addr == HEXAGON_MAPPING_ERROR;\n",
"-}\n",
"-\n",
"-const struct dma_map_ops hexagon_dma_ops = {\n",
@@ -317,4 +320,4 @@
"2.17.0"
]
-50c695c0bb1329c640e07e25065a48c6023dc26cdc06074a14547b7aad4226d2
+a340cef55e9c9b1d45cbebaeb6a001d65234bfb38ccde81de8a44c4070618ed9
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.