diff for duplicates of <3581114.cp3kRzV18i@avalon> diff --git a/a/1.txt b/N1/1.txt index 1147c0f..452e7a0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -525,7 +525,8 @@ see below. > + ret = l2alloc(priv, l1index); > + if (!ret) { > + for (i = 0; i < 0x10; i++) -> + priv->l2[l1index].pgtable[l2index + i] > + paddr | 0xff1; +> + priv->l2[l1index].pgtable[l2index + i] = +> + paddr | 0xff1; > + } > + spin_unlock(&priv->map_lock); > + break; @@ -612,7 +613,7 @@ see below. > + case 2: > + return (l2entry & ~0xfff) | (iova & 0xfff); > + default: -> + if ((l1entry & 3) = 2) +> + if ((l1entry & 3) == 2) > + return (l1entry & ~0xfffff) | (iova & 0xfffff); > + return 0; > + } diff --git a/a/content_digest b/N1/content_digest index c0bc2cd..2ea6fa1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01350290093-998-1-git-send-email-hdk@igel.co.jp\0" "ref\01350290093-998-2-git-send-email-hdk@igel.co.jp\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v4 1/2] iommu/shmobile: Add iommu driver for Renesas IPMMU modules\0" - "Date\0Mon, 10 Dec 2012 15:55:58 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v4 1/2] iommu/shmobile: Add iommu driver for Renesas IPMMU modules\0" + "Date\0Mon, 10 Dec 2012 16:55:58 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -533,7 +533,8 @@ "> +\t\tret = l2alloc(priv, l1index);\n" "> +\t\tif (!ret) {\n" "> +\t\t\tfor (i = 0; i < 0x10; i++)\n" - "> +\t\t\t\tpriv->l2[l1index].pgtable[l2index + i] > +\t\t\t\t\tpaddr | 0xff1;\n" + "> +\t\t\t\tpriv->l2[l1index].pgtable[l2index + i] =\n" + "> +\t\t\t\t\tpaddr | 0xff1;\n" "> +\t\t}\n" "> +\t\tspin_unlock(&priv->map_lock);\n" "> +\t\tbreak;\n" @@ -620,7 +621,7 @@ "> +\tcase 2:\n" "> +\t\treturn (l2entry & ~0xfff) | (iova & 0xfff);\n" "> +\tdefault:\n" - "> +\t\tif ((l1entry & 3) = 2)\n" + "> +\t\tif ((l1entry & 3) == 2)\n" "> +\t\t\treturn (l1entry & ~0xfffff) | (iova & 0xfffff);\n" "> +\t\treturn 0;\n" "> +\t}\n" @@ -729,4 +730,4 @@ "\n" Laurent Pinchart -a034c6000c20653d71a610aa7e0798eb78acbd218b56292d5e32525a0f74db8f +3cdbc4ea50ba4d2633bfc0152a9fc31f47bb61370bb33f4566c224e346fa6fd5
diff --git a/a/1.txt b/N2/1.txt index 1147c0f..452e7a0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -525,7 +525,8 @@ see below. > + ret = l2alloc(priv, l1index); > + if (!ret) { > + for (i = 0; i < 0x10; i++) -> + priv->l2[l1index].pgtable[l2index + i] > + paddr | 0xff1; +> + priv->l2[l1index].pgtable[l2index + i] = +> + paddr | 0xff1; > + } > + spin_unlock(&priv->map_lock); > + break; @@ -612,7 +613,7 @@ see below. > + case 2: > + return (l2entry & ~0xfff) | (iova & 0xfff); > + default: -> + if ((l1entry & 3) = 2) +> + if ((l1entry & 3) == 2) > + return (l1entry & ~0xfffff) | (iova & 0xfffff); > + return 0; > + } diff --git a/a/content_digest b/N2/content_digest index c0bc2cd..b983030 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,18 @@ "ref\01350290093-998-2-git-send-email-hdk@igel.co.jp\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v4 1/2] iommu/shmobile: Add iommu driver for Renesas IPMMU modules\0" - "Date\0Mon, 10 Dec 2012 15:55:58 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Mon, 10 Dec 2012 16:55:58 +0100\0" + "To\0Hideki EIRAKU <hdk@igel.co.jp>\0" + "Cc\0Paul Mundt <lethal@linux-sh.org>" + Magnus Damm <magnus.damm@gmail.com> + Russell King <linux@arm.linux.org.uk> + Simon Horman <horms@verge.net.au> + linux-sh@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + Marek Szyprowski <m.szyprowski@samsung.com> + Katsuya MATSUBARA <matsu@igel.co.jp> + " Damian Hobson-Garcia <dhobsong@igel.co.jp>\0" "\00:1\0" "b\0" "Dear Eiraku-san,\n" @@ -533,7 +543,8 @@ "> +\t\tret = l2alloc(priv, l1index);\n" "> +\t\tif (!ret) {\n" "> +\t\t\tfor (i = 0; i < 0x10; i++)\n" - "> +\t\t\t\tpriv->l2[l1index].pgtable[l2index + i] > +\t\t\t\t\tpaddr | 0xff1;\n" + "> +\t\t\t\tpriv->l2[l1index].pgtable[l2index + i] =\n" + "> +\t\t\t\t\tpaddr | 0xff1;\n" "> +\t\t}\n" "> +\t\tspin_unlock(&priv->map_lock);\n" "> +\t\tbreak;\n" @@ -620,7 +631,7 @@ "> +\tcase 2:\n" "> +\t\treturn (l2entry & ~0xfff) | (iova & 0xfff);\n" "> +\tdefault:\n" - "> +\t\tif ((l1entry & 3) = 2)\n" + "> +\t\tif ((l1entry & 3) == 2)\n" "> +\t\t\treturn (l1entry & ~0xfffff) | (iova & 0xfffff);\n" "> +\t\treturn 0;\n" "> +\t}\n" @@ -729,4 +740,4 @@ "\n" Laurent Pinchart -a034c6000c20653d71a610aa7e0798eb78acbd218b56292d5e32525a0f74db8f +d5ff0ec91e3bc848395ad0c799b14419da6c4621af9b7f2249464eb4e5628496
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.