All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <20170616181059.19206-19-hch@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index 9796df8..5146441 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -22,8 +22,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	paddr &= PAGE_MASK;
  
  	address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);
--	if (address = DMA_ERROR_CODE)
-+	if (address = AMD_IOMMU_MAPPING_ERROR)
+-	if (address == DMA_ERROR_CODE)
++	if (address == AMD_IOMMU_MAPPING_ERROR)
  		goto out;
  
  	prot = dir2prot(direction);
@@ -37,7 +37,7 @@ index 63cacf5d6cf2..d41280e869de 100644
  
  /*
 @@ -2483,7 +2485,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
- 	if (PTR_ERR(domain) = -EINVAL)
+ 	if (PTR_ERR(domain) == -EINVAL)
  		return (dma_addr_t)paddr;
  	else if (IS_ERR(domain))
 -		return DMA_ERROR_CODE;
@@ -49,8 +49,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	npages = sg_num_pages(dev, sglist, nelems);
  
  	address = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);
--	if (address = DMA_ERROR_CODE)
-+	if (address = AMD_IOMMU_MAPPING_ERROR)
+-	if (address == DMA_ERROR_CODE)
++	if (address == AMD_IOMMU_MAPPING_ERROR)
  		goto out_err;
  
  	prot = dir2prot(direction);
@@ -58,8 +58,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	*dma_addr = __map_single(dev, dma_dom, page_to_phys(page),
  				 size, DMA_BIDIRECTIONAL, dma_mask);
  
--	if (*dma_addr = DMA_ERROR_CODE)
-+	if (*dma_addr = AMD_IOMMU_MAPPING_ERROR)
+-	if (*dma_addr == DMA_ERROR_CODE)
++	if (*dma_addr == AMD_IOMMU_MAPPING_ERROR)
  		goto out_free;
  
  	return page_address(page);
@@ -69,7 +69,7 @@ index 63cacf5d6cf2..d41280e869de 100644
  
 +static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr)
 +{
-+	return dma_addr = AMD_IOMMU_MAPPING_ERROR;
++	return dma_addr == AMD_IOMMU_MAPPING_ERROR;
 +}
 +
  static const struct dma_map_ops amd_iommu_dma_ops = {
@@ -84,4 +84,10 @@ index 63cacf5d6cf2..d41280e869de 100644
  
  static int init_reserved_iova_ranges(void)
 -- 
-2.11.0
\ No newline at end of file
+2.11.0
+
+
+_______________________________________________
+Xen-devel mailing list
+Xen-devel@lists.xen.org
+https://lists.xen.org/xen-devel
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index b89e2a2..6708c8e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH 18/44] iommu/amd: implement ->mapping_error\0"
 ]
 [
-  "Date\0Fri, 16 Jun 2017 18:10:33 +0000\0"
+  "Date\0Fri, 16 Jun 2017 20:10:33 +0200\0"
 ]
 [
   "To\0x86\@kernel.org",
@@ -65,8 +65,8 @@
   " \tpaddr &= PAGE_MASK;\n",
   " \n",
   " \taddress = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);\n",
-  "-\tif (address = DMA_ERROR_CODE)\n",
-  "+\tif (address = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (address == DMA_ERROR_CODE)\n",
+  "+\tif (address == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out;\n",
   " \n",
   " \tprot = dir2prot(direction);\n",
@@ -80,7 +80,7 @@
   " \n",
   " /*\n",
   "\@\@ -2483,7 +2485,7 \@\@ static dma_addr_t map_page(struct device *dev, struct page *page,\n",
-  " \tif (PTR_ERR(domain) = -EINVAL)\n",
+  " \tif (PTR_ERR(domain) == -EINVAL)\n",
   " \t\treturn (dma_addr_t)paddr;\n",
   " \telse if (IS_ERR(domain))\n",
   "-\t\treturn DMA_ERROR_CODE;\n",
@@ -92,8 +92,8 @@
   " \tnpages = sg_num_pages(dev, sglist, nelems);\n",
   " \n",
   " \taddress = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);\n",
-  "-\tif (address = DMA_ERROR_CODE)\n",
-  "+\tif (address = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (address == DMA_ERROR_CODE)\n",
+  "+\tif (address == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out_err;\n",
   " \n",
   " \tprot = dir2prot(direction);\n",
@@ -101,8 +101,8 @@
   " \t*dma_addr = __map_single(dev, dma_dom, page_to_phys(page),\n",
   " \t\t\t\t size, DMA_BIDIRECTIONAL, dma_mask);\n",
   " \n",
-  "-\tif (*dma_addr = DMA_ERROR_CODE)\n",
-  "+\tif (*dma_addr = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (*dma_addr == DMA_ERROR_CODE)\n",
+  "+\tif (*dma_addr == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out_free;\n",
   " \n",
   " \treturn page_address(page);\n",
@@ -112,7 +112,7 @@
   " \n",
   "+static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
   "+{\n",
-  "+\treturn dma_addr = AMD_IOMMU_MAPPING_ERROR;\n",
+  "+\treturn dma_addr == AMD_IOMMU_MAPPING_ERROR;\n",
   "+}\n",
   "+\n",
   " static const struct dma_map_ops amd_iommu_dma_ops = {\n",
@@ -127,7 +127,13 @@
   " \n",
   " static int init_reserved_iova_ranges(void)\n",
   "-- \n",
-  "2.11.0"
+  "2.11.0\n",
+  "\n",
+  "\n",
+  "_______________________________________________\n",
+  "Xen-devel mailing list\n",
+  "Xen-devel\@lists.xen.org\n",
+  "https://lists.xen.org/xen-devel"
 ]
 
-459e6aa27828865df45043213e01ac3f38874f61e77b58e96af3cd573ac66bd8
+2e80fe4ad66d1530a1570d095bdac5bd8498f4426a0cae1afa3dfb7b6ee6bc53

diff --git a/a/1.txt b/N2/1.txt
index 9796df8..966dd57 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -22,8 +22,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	paddr &= PAGE_MASK;
  
  	address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);
--	if (address = DMA_ERROR_CODE)
-+	if (address = AMD_IOMMU_MAPPING_ERROR)
+-	if (address == DMA_ERROR_CODE)
++	if (address == AMD_IOMMU_MAPPING_ERROR)
  		goto out;
  
  	prot = dir2prot(direction);
@@ -37,7 +37,7 @@ index 63cacf5d6cf2..d41280e869de 100644
  
  /*
 @@ -2483,7 +2485,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
- 	if (PTR_ERR(domain) = -EINVAL)
+ 	if (PTR_ERR(domain) == -EINVAL)
  		return (dma_addr_t)paddr;
  	else if (IS_ERR(domain))
 -		return DMA_ERROR_CODE;
@@ -49,8 +49,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	npages = sg_num_pages(dev, sglist, nelems);
  
  	address = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);
--	if (address = DMA_ERROR_CODE)
-+	if (address = AMD_IOMMU_MAPPING_ERROR)
+-	if (address == DMA_ERROR_CODE)
++	if (address == AMD_IOMMU_MAPPING_ERROR)
  		goto out_err;
  
  	prot = dir2prot(direction);
@@ -58,8 +58,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	*dma_addr = __map_single(dev, dma_dom, page_to_phys(page),
  				 size, DMA_BIDIRECTIONAL, dma_mask);
  
--	if (*dma_addr = DMA_ERROR_CODE)
-+	if (*dma_addr = AMD_IOMMU_MAPPING_ERROR)
+-	if (*dma_addr == DMA_ERROR_CODE)
++	if (*dma_addr == AMD_IOMMU_MAPPING_ERROR)
  		goto out_free;
  
  	return page_address(page);
@@ -69,7 +69,7 @@ index 63cacf5d6cf2..d41280e869de 100644
  
 +static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr)
 +{
-+	return dma_addr = AMD_IOMMU_MAPPING_ERROR;
++	return dma_addr == AMD_IOMMU_MAPPING_ERROR;
 +}
 +
  static const struct dma_map_ops amd_iommu_dma_ops = {
diff --git a/a/content_digest b/N2/content_digest
index b89e2a2..d167b55 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH 18/44] iommu/amd: implement ->mapping_error\0"
 ]
 [
-  "Date\0Fri, 16 Jun 2017 18:10:33 +0000\0"
+  "Date\0Fri, 16 Jun 2017 20:10:33 +0200\0"
 ]
 [
   "To\0x86\@kernel.org",
@@ -65,8 +65,8 @@
   " \tpaddr &= PAGE_MASK;\n",
   " \n",
   " \taddress = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);\n",
-  "-\tif (address = DMA_ERROR_CODE)\n",
-  "+\tif (address = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (address == DMA_ERROR_CODE)\n",
+  "+\tif (address == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out;\n",
   " \n",
   " \tprot = dir2prot(direction);\n",
@@ -80,7 +80,7 @@
   " \n",
   " /*\n",
   "\@\@ -2483,7 +2485,7 \@\@ static dma_addr_t map_page(struct device *dev, struct page *page,\n",
-  " \tif (PTR_ERR(domain) = -EINVAL)\n",
+  " \tif (PTR_ERR(domain) == -EINVAL)\n",
   " \t\treturn (dma_addr_t)paddr;\n",
   " \telse if (IS_ERR(domain))\n",
   "-\t\treturn DMA_ERROR_CODE;\n",
@@ -92,8 +92,8 @@
   " \tnpages = sg_num_pages(dev, sglist, nelems);\n",
   " \n",
   " \taddress = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);\n",
-  "-\tif (address = DMA_ERROR_CODE)\n",
-  "+\tif (address = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (address == DMA_ERROR_CODE)\n",
+  "+\tif (address == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out_err;\n",
   " \n",
   " \tprot = dir2prot(direction);\n",
@@ -101,8 +101,8 @@
   " \t*dma_addr = __map_single(dev, dma_dom, page_to_phys(page),\n",
   " \t\t\t\t size, DMA_BIDIRECTIONAL, dma_mask);\n",
   " \n",
-  "-\tif (*dma_addr = DMA_ERROR_CODE)\n",
-  "+\tif (*dma_addr = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (*dma_addr == DMA_ERROR_CODE)\n",
+  "+\tif (*dma_addr == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out_free;\n",
   " \n",
   " \treturn page_address(page);\n",
@@ -112,7 +112,7 @@
   " \n",
   "+static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
   "+{\n",
-  "+\treturn dma_addr = AMD_IOMMU_MAPPING_ERROR;\n",
+  "+\treturn dma_addr == AMD_IOMMU_MAPPING_ERROR;\n",
   "+}\n",
   "+\n",
   " static const struct dma_map_ops amd_iommu_dma_ops = {\n",
@@ -130,4 +130,4 @@
   "2.11.0"
 ]
 
-459e6aa27828865df45043213e01ac3f38874f61e77b58e96af3cd573ac66bd8
+b2e1e180ac31e97450c3bddbc7545d28ece3f411ccd4b65191ac621408ab1acd

diff --git a/a/1.txt b/N3/1.txt
index 9796df8..966dd57 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -22,8 +22,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	paddr &= PAGE_MASK;
  
  	address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);
--	if (address = DMA_ERROR_CODE)
-+	if (address = AMD_IOMMU_MAPPING_ERROR)
+-	if (address == DMA_ERROR_CODE)
++	if (address == AMD_IOMMU_MAPPING_ERROR)
  		goto out;
  
  	prot = dir2prot(direction);
@@ -37,7 +37,7 @@ index 63cacf5d6cf2..d41280e869de 100644
  
  /*
 @@ -2483,7 +2485,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
- 	if (PTR_ERR(domain) = -EINVAL)
+ 	if (PTR_ERR(domain) == -EINVAL)
  		return (dma_addr_t)paddr;
  	else if (IS_ERR(domain))
 -		return DMA_ERROR_CODE;
@@ -49,8 +49,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	npages = sg_num_pages(dev, sglist, nelems);
  
  	address = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);
--	if (address = DMA_ERROR_CODE)
-+	if (address = AMD_IOMMU_MAPPING_ERROR)
+-	if (address == DMA_ERROR_CODE)
++	if (address == AMD_IOMMU_MAPPING_ERROR)
  		goto out_err;
  
  	prot = dir2prot(direction);
@@ -58,8 +58,8 @@ index 63cacf5d6cf2..d41280e869de 100644
  	*dma_addr = __map_single(dev, dma_dom, page_to_phys(page),
  				 size, DMA_BIDIRECTIONAL, dma_mask);
  
--	if (*dma_addr = DMA_ERROR_CODE)
-+	if (*dma_addr = AMD_IOMMU_MAPPING_ERROR)
+-	if (*dma_addr == DMA_ERROR_CODE)
++	if (*dma_addr == AMD_IOMMU_MAPPING_ERROR)
  		goto out_free;
  
  	return page_address(page);
@@ -69,7 +69,7 @@ index 63cacf5d6cf2..d41280e869de 100644
  
 +static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr)
 +{
-+	return dma_addr = AMD_IOMMU_MAPPING_ERROR;
++	return dma_addr == AMD_IOMMU_MAPPING_ERROR;
 +}
 +
  static const struct dma_map_ops amd_iommu_dma_ops = {
diff --git a/a/content_digest b/N3/content_digest
index b89e2a2..d4a54c7 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -2,37 +2,16 @@
   "ref\00020170616181059.19206-1-hch\@lst.de\0"
 ]
 [
-  "From\0Christoph Hellwig <hch\@lst.de>\0"
+  "From\0hch\@lst.de (Christoph Hellwig)\0"
 ]
 [
   "Subject\0[PATCH 18/44] iommu/amd: implement ->mapping_error\0"
 ]
 [
-  "Date\0Fri, 16 Jun 2017 18:10:33 +0000\0"
+  "Date\0Fri, 16 Jun 2017 20:10:33 +0200\0"
 ]
 [
-  "To\0x86\@kernel.org",
-  " linux-arm-kernel\@lists.infradead.org",
-  " xen-devel\@lists.xenproject.org",
-  " linux-c6x-dev\@linux-c6x.org",
-  " linux-hexagon\@vger.kernel.org",
-  " linux-ia64\@vger.kernel.org",
-  " linux-mips\@linux-mips.org",
-  " openrisc\@lists.librecores.org",
-  " linuxppc-dev\@lists.ozlabs.org",
-  " linux-s390\@vger.kernel.org",
-  " linux-sh\@vger.kernel.org",
-  " sparclinux\@vger.kernel.org",
-  " linux-xtensa\@linux-xtensa.org",
-  " dmaengine\@vger.kernel.org",
-  " linux-tegra\@vger.kernel.org",
-  " dri-devel\@lists.freedesktop.org",
-  " linux-samsung-soc\@vger.kernel.org",
-  " iommu\@lists.linux-foundation.org",
-  " netdev\@vger.kernel.org\0"
-]
-[
-  "Cc\0linux-kernel\@vger.kernel.org\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -65,8 +44,8 @@
   " \tpaddr &= PAGE_MASK;\n",
   " \n",
   " \taddress = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);\n",
-  "-\tif (address = DMA_ERROR_CODE)\n",
-  "+\tif (address = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (address == DMA_ERROR_CODE)\n",
+  "+\tif (address == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out;\n",
   " \n",
   " \tprot = dir2prot(direction);\n",
@@ -80,7 +59,7 @@
   " \n",
   " /*\n",
   "\@\@ -2483,7 +2485,7 \@\@ static dma_addr_t map_page(struct device *dev, struct page *page,\n",
-  " \tif (PTR_ERR(domain) = -EINVAL)\n",
+  " \tif (PTR_ERR(domain) == -EINVAL)\n",
   " \t\treturn (dma_addr_t)paddr;\n",
   " \telse if (IS_ERR(domain))\n",
   "-\t\treturn DMA_ERROR_CODE;\n",
@@ -92,8 +71,8 @@
   " \tnpages = sg_num_pages(dev, sglist, nelems);\n",
   " \n",
   " \taddress = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);\n",
-  "-\tif (address = DMA_ERROR_CODE)\n",
-  "+\tif (address = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (address == DMA_ERROR_CODE)\n",
+  "+\tif (address == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out_err;\n",
   " \n",
   " \tprot = dir2prot(direction);\n",
@@ -101,8 +80,8 @@
   " \t*dma_addr = __map_single(dev, dma_dom, page_to_phys(page),\n",
   " \t\t\t\t size, DMA_BIDIRECTIONAL, dma_mask);\n",
   " \n",
-  "-\tif (*dma_addr = DMA_ERROR_CODE)\n",
-  "+\tif (*dma_addr = AMD_IOMMU_MAPPING_ERROR)\n",
+  "-\tif (*dma_addr == DMA_ERROR_CODE)\n",
+  "+\tif (*dma_addr == AMD_IOMMU_MAPPING_ERROR)\n",
   " \t\tgoto out_free;\n",
   " \n",
   " \treturn page_address(page);\n",
@@ -112,7 +91,7 @@
   " \n",
   "+static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
   "+{\n",
-  "+\treturn dma_addr = AMD_IOMMU_MAPPING_ERROR;\n",
+  "+\treturn dma_addr == AMD_IOMMU_MAPPING_ERROR;\n",
   "+}\n",
   "+\n",
   " static const struct dma_map_ops amd_iommu_dma_ops = {\n",
@@ -130,4 +109,4 @@
   "2.11.0"
 ]
 
-459e6aa27828865df45043213e01ac3f38874f61e77b58e96af3cd573ac66bd8
+197f7373664a4d14eb9749695909bd2b71c90908bf6aec24f45603b0ef3baa11
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.