diff for duplicates of <561248BD.8080809@arm.com> diff --git a/a/1.txt b/N1/1.txt index 1354d35..244ab1f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -79,7 +79,7 @@ Andre. > entry = iommu_tbl_range_alloc(NULL, &iommu->iommu_map_table, > npages, NULL, (unsigned long)-1, 0); > - if (unlikely(entry < 0)) -> + if (unlikely(entry = DMA_ERROR_CODE)) +> + if (unlikely(entry == DMA_ERROR_CODE)) > return NULL; > > return iommu->page_table + entry; diff --git a/a/content_digest b/N1/content_digest index ccbec09..f99760d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\055FC49B8.3020100@arm.com\0" "ref\01442855829-11245-1-git-send-email-andre.przywara@arm.com\0" - "From\0Andre Przywara <andre.przywara@arm.com>\0" - "Subject\0Re: [PATCH] sparc(64)/iommu: fixup iommu_tbl_range_alloc() types\0" - "Date\0Mon, 05 Oct 2015 09:54:05 +0000\0" + "From\0andre.przywara@arm.com (Andre Przywara)\0" + "Subject\0[PATCH] sparc(64)/iommu: fixup iommu_tbl_range_alloc() types\0" + "Date\0Mon, 5 Oct 2015 10:54:05 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -87,7 +87,7 @@ "> \tentry = iommu_tbl_range_alloc(NULL, &iommu->iommu_map_table,\n" "> \t\t\t\t npages, NULL, (unsigned long)-1, 0);\n" "> -\tif (unlikely(entry < 0))\n" - "> +\tif (unlikely(entry = DMA_ERROR_CODE))\n" + "> +\tif (unlikely(entry == DMA_ERROR_CODE))\n" "> \t\treturn NULL;\n" "> \n" "> \treturn iommu->page_table + entry;\n" @@ -125,4 +125,4 @@ "> \t\t/* Sanity check */\n" > -ff633500e49321a30742bec56521f99f2e4fb5d9849453097beaf16ba9970404 +9f86f6e3a37a392acf9921f5b68dcc69ab345ce167293e76a4755bc379ec6b13
diff --git a/a/1.txt b/N2/1.txt index 1354d35..244ab1f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -79,7 +79,7 @@ Andre. > entry = iommu_tbl_range_alloc(NULL, &iommu->iommu_map_table, > npages, NULL, (unsigned long)-1, 0); > - if (unlikely(entry < 0)) -> + if (unlikely(entry = DMA_ERROR_CODE)) +> + if (unlikely(entry == DMA_ERROR_CODE)) > return NULL; > > return iommu->page_table + entry; diff --git a/a/content_digest b/N2/content_digest index ccbec09..e02165e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,12 @@ "ref\01442855829-11245-1-git-send-email-andre.przywara@arm.com\0" "From\0Andre Przywara <andre.przywara@arm.com>\0" "Subject\0Re: [PATCH] sparc(64)/iommu: fixup iommu_tbl_range_alloc() types\0" - "Date\0Mon, 05 Oct 2015 09:54:05 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Mon, 5 Oct 2015 10:54:05 +0100\0" + "To\0David S. Miller <davem@davemloft.net>\0" + "Cc\0Joerg Roedel <joro@8bytes.org>" + sparclinux@vger.kernel.org <sparclinux@vger.kernel.org> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "Hi David,\n" @@ -87,7 +91,7 @@ "> \tentry = iommu_tbl_range_alloc(NULL, &iommu->iommu_map_table,\n" "> \t\t\t\t npages, NULL, (unsigned long)-1, 0);\n" "> -\tif (unlikely(entry < 0))\n" - "> +\tif (unlikely(entry = DMA_ERROR_CODE))\n" + "> +\tif (unlikely(entry == DMA_ERROR_CODE))\n" "> \t\treturn NULL;\n" "> \n" "> \treturn iommu->page_table + entry;\n" @@ -125,4 +129,4 @@ "> \t\t/* Sanity check */\n" > -ff633500e49321a30742bec56521f99f2e4fb5d9849453097beaf16ba9970404 +8fb5f34539ce7e1cab0c2c942ef8dcefe23252977570e865f59b176e35375e7c
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.