diff for duplicates of <1367825157-27231-7-git-send-email-aik@ozlabs.ru>
diff --git a/a/content_digest b/N1/content_digest
index d47e9b3..8b72149 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,15 +14,14 @@
"To\0linuxppc-dev\@lists.ozlabs.org\0"
]
[
- "Cc\0Alexey Kardashevskiy <aik\@ozlabs.ru>",
- " David Gibson <david\@gibson.dropbear.id.au>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
+ "Cc\0kvm\@vger.kernel.org",
+ " Alexey Kardashevskiy <aik\@ozlabs.ru>",
" Alexander Graf <agraf\@suse.de>",
+ " kvm-ppc\@vger.kernel.org",
+ " Alex Williamson <alex.williamson\@redhat.com>",
" Paul Mackerras <paulus\@samba.org>",
" Joerg Roedel <joerg.roedel\@amd.com>",
- " Alex Williamson <alex.williamson\@redhat.com>",
- " kvm\@vger.kernel.org",
- " kvm-ppc\@vger.kernel.org\0"
+ " David Gibson <david\@gibson.dropbear.id.au>\0"
]
[
"\0000:1\0"
@@ -300,4 +299,4 @@
"1.7.10.4"
]
-0fde2cceb1f14d8325d34d1bcca882fa15326a3e93beaf04ec41dca902a18a3a
+d0b60bd5cd16d8e9f5ab697acfab7124612cc1236dbcdd38d3120db86cd84cf2
diff --git a/a/1.txt b/N2/1.txt
index eaa930d..92c260a 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -157,7 +157,7 @@ index 98cf949..274458d 100644
ret = iommu_tce_put_param_check(tbl, ioba, tce);
if (ret)
@@ -268,7 +325,27 @@ static int put_tce_virt_mode(struct kvmppc_spapr_tce_table *tt,
- if (pg_size == PAGE_SIZE)
+ if (pg_size = PAGE_SIZE)
return iommu_put_tce_user_mode(tbl, entry, tce);
- return -EAGAIN;
@@ -204,7 +204,7 @@ index c5e5905..a91ff7b 100644
+
+ spin_lock(&tt->hugepages_lock);
+ list_for_each_entry(hp, &tt->hugepages, list) {
-+ if (hp->pte == pte) {
++ if (hp->pte = pte) {
+ ret = hp;
+ break;
+ }
diff --git a/a/content_digest b/N2/content_digest
index d47e9b3..b83a063 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 6/6] KVM: PPC: Add hugepage support for IOMMU in-kernel handling\0"
]
[
- "Date\0Mon, 6 May 2013 17:25:57 +1000\0"
+ "Date\0Mon, 06 May 2013 07:25:57 +0000\0"
]
[
"To\0linuxppc-dev\@lists.ozlabs.org\0"
@@ -190,7 +190,7 @@
" \tret = iommu_tce_put_param_check(tbl, ioba, tce);\n",
" \tif (ret)\n",
"\@\@ -268,7 +325,27 \@\@ static int put_tce_virt_mode(struct kvmppc_spapr_tce_table *tt,\n",
- " \tif (pg_size == PAGE_SIZE)\n",
+ " \tif (pg_size = PAGE_SIZE)\n",
" \t\treturn iommu_put_tce_user_mode(tbl, entry, tce);\n",
" \n",
"-\treturn -EAGAIN;\n",
@@ -237,7 +237,7 @@
"+\n",
"+\tspin_lock(&tt->hugepages_lock);\n",
"+\tlist_for_each_entry(hp, &tt->hugepages, list) {\n",
- "+\t\tif (hp->pte == pte) {\n",
+ "+\t\tif (hp->pte = pte) {\n",
"+\t\t\tret = hp;\n",
"+\t\t\tbreak;\n",
"+\t\t}\n",
@@ -300,4 +300,4 @@
"1.7.10.4"
]
-0fde2cceb1f14d8325d34d1bcca882fa15326a3e93beaf04ec41dca902a18a3a
+d4eebb834b5d05076d5f7315404c1c5a7e6f43a9434070c9fc7a1e45ef9ff7bf
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.