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

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

diff --git a/a/1.txt b/N1/1.txt
index 15ee8bf..1d31e75 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -31,8 +31,8 @@ index fda7867046d0..e75b490f2b0b 100644
  
  	entry = iommu_range_alloc(dev, tbl, npages);
  
--	if (unlikely(entry = DMA_ERROR_CODE)) {
-+	if (unlikely(entry = CALGARY_MAPPING_ERROR)) {
+-	if (unlikely(entry == DMA_ERROR_CODE)) {
++	if (unlikely(entry == CALGARY_MAPPING_ERROR)) {
  		pr_warn("failed to allocate %u pages in iommu %p\n",
  			npages, tbl);
 -		return DMA_ERROR_CODE;
@@ -53,8 +53,8 @@ index fda7867046d0..e75b490f2b0b 100644
  		npages = iommu_num_pages(vaddr, s->length, PAGE_SIZE);
  
  		entry = iommu_range_alloc(dev, tbl, npages);
--		if (entry = DMA_ERROR_CODE) {
-+		if (entry = CALGARY_MAPPING_ERROR) {
+-		if (entry == DMA_ERROR_CODE) {
++		if (entry == CALGARY_MAPPING_ERROR) {
  			/* makes sure unmap knows to stop */
  			s->dma_length = 0;
  			goto error;
@@ -71,8 +71,8 @@ index fda7867046d0..e75b490f2b0b 100644
  
  	/* set up tces to cover the allocated range */
  	mapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL);
--	if (mapping = DMA_ERROR_CODE)
-+	if (mapping = CALGARY_MAPPING_ERROR)
+-	if (mapping == DMA_ERROR_CODE)
++	if (mapping == CALGARY_MAPPING_ERROR)
  		goto free;
  	*dma_handle = mapping;
  	return ret;
@@ -82,7 +82,7 @@ index fda7867046d0..e75b490f2b0b 100644
  
 +static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr)
 +{
-+	return dma_addr = CALGARY_MAPPING_ERROR;
++	return dma_addr == CALGARY_MAPPING_ERROR;
 +}
 +
  static const struct dma_map_ops calgary_dma_ops = {
@@ -106,4 +106,10 @@ index fda7867046d0..e75b490f2b0b 100644
  	/* avoid the BIOS/VGA first 640KB-1MB region */
  	/* for CalIOC2 - avoid the entire first MB */
 -- 
-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 c70603d..210f74c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH 23/44] x86/calgary: implement ->mapping_error\0"
 ]
 [
-  "Date\0Fri, 16 Jun 2017 18:10:38 +0000\0"
+  "Date\0Fri, 16 Jun 2017 20:10:38 +0200\0"
 ]
 [
   "To\0x86\@kernel.org",
@@ -74,8 +74,8 @@
   " \n",
   " \tentry = iommu_range_alloc(dev, tbl, npages);\n",
   " \n",
-  "-\tif (unlikely(entry = DMA_ERROR_CODE)) {\n",
-  "+\tif (unlikely(entry = CALGARY_MAPPING_ERROR)) {\n",
+  "-\tif (unlikely(entry == DMA_ERROR_CODE)) {\n",
+  "+\tif (unlikely(entry == CALGARY_MAPPING_ERROR)) {\n",
   " \t\tpr_warn(\"failed to allocate %u pages in iommu %p\\n\",\n",
   " \t\t\tnpages, tbl);\n",
   "-\t\treturn DMA_ERROR_CODE;\n",
@@ -96,8 +96,8 @@
   " \t\tnpages = iommu_num_pages(vaddr, s->length, PAGE_SIZE);\n",
   " \n",
   " \t\tentry = iommu_range_alloc(dev, tbl, npages);\n",
-  "-\t\tif (entry = DMA_ERROR_CODE) {\n",
-  "+\t\tif (entry = CALGARY_MAPPING_ERROR) {\n",
+  "-\t\tif (entry == DMA_ERROR_CODE) {\n",
+  "+\t\tif (entry == CALGARY_MAPPING_ERROR) {\n",
   " \t\t\t/* makes sure unmap knows to stop */\n",
   " \t\t\ts->dma_length = 0;\n",
   " \t\t\tgoto error;\n",
@@ -114,8 +114,8 @@
   " \n",
   " \t/* set up tces to cover the allocated range */\n",
   " \tmapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL);\n",
-  "-\tif (mapping = DMA_ERROR_CODE)\n",
-  "+\tif (mapping = CALGARY_MAPPING_ERROR)\n",
+  "-\tif (mapping == DMA_ERROR_CODE)\n",
+  "+\tif (mapping == CALGARY_MAPPING_ERROR)\n",
   " \t\tgoto free;\n",
   " \t*dma_handle = mapping;\n",
   " \treturn ret;\n",
@@ -125,7 +125,7 @@
   " \n",
   "+static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
   "+{\n",
-  "+\treturn dma_addr = CALGARY_MAPPING_ERROR;\n",
+  "+\treturn dma_addr == CALGARY_MAPPING_ERROR;\n",
   "+}\n",
   "+\n",
   " static const struct dma_map_ops calgary_dma_ops = {\n",
@@ -149,7 +149,13 @@
   " \t/* avoid the BIOS/VGA first 640KB-1MB region */\n",
   " \t/* for CalIOC2 - avoid the entire first MB */\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"
 ]
 
-8440192bd0087efee4761f0b03686ac7d747c85927a45c869eb6a769d76f8a72
+974ed0c32acdf6161f1978bb9b508e248ca9feddb2e16c779095fdbf182ac64b

diff --git a/a/1.txt b/N2/1.txt
index 15ee8bf..1847d8f 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -31,8 +31,8 @@ index fda7867046d0..e75b490f2b0b 100644
  
  	entry = iommu_range_alloc(dev, tbl, npages);
  
--	if (unlikely(entry = DMA_ERROR_CODE)) {
-+	if (unlikely(entry = CALGARY_MAPPING_ERROR)) {
+-	if (unlikely(entry == DMA_ERROR_CODE)) {
++	if (unlikely(entry == CALGARY_MAPPING_ERROR)) {
  		pr_warn("failed to allocate %u pages in iommu %p\n",
  			npages, tbl);
 -		return DMA_ERROR_CODE;
@@ -53,8 +53,8 @@ index fda7867046d0..e75b490f2b0b 100644
  		npages = iommu_num_pages(vaddr, s->length, PAGE_SIZE);
  
  		entry = iommu_range_alloc(dev, tbl, npages);
--		if (entry = DMA_ERROR_CODE) {
-+		if (entry = CALGARY_MAPPING_ERROR) {
+-		if (entry == DMA_ERROR_CODE) {
++		if (entry == CALGARY_MAPPING_ERROR) {
  			/* makes sure unmap knows to stop */
  			s->dma_length = 0;
  			goto error;
@@ -71,8 +71,8 @@ index fda7867046d0..e75b490f2b0b 100644
  
  	/* set up tces to cover the allocated range */
  	mapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL);
--	if (mapping = DMA_ERROR_CODE)
-+	if (mapping = CALGARY_MAPPING_ERROR)
+-	if (mapping == DMA_ERROR_CODE)
++	if (mapping == CALGARY_MAPPING_ERROR)
  		goto free;
  	*dma_handle = mapping;
  	return ret;
@@ -82,7 +82,7 @@ index fda7867046d0..e75b490f2b0b 100644
  
 +static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr)
 +{
-+	return dma_addr = CALGARY_MAPPING_ERROR;
++	return dma_addr == CALGARY_MAPPING_ERROR;
 +}
 +
  static const struct dma_map_ops calgary_dma_ops = {
diff --git a/a/content_digest b/N2/content_digest
index c70603d..9bac362 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH 23/44] x86/calgary: implement ->mapping_error\0"
 ]
 [
-  "Date\0Fri, 16 Jun 2017 18:10:38 +0000\0"
+  "Date\0Fri, 16 Jun 2017 20:10:38 +0200\0"
 ]
 [
   "To\0x86\@kernel.org",
@@ -74,8 +74,8 @@
   " \n",
   " \tentry = iommu_range_alloc(dev, tbl, npages);\n",
   " \n",
-  "-\tif (unlikely(entry = DMA_ERROR_CODE)) {\n",
-  "+\tif (unlikely(entry = CALGARY_MAPPING_ERROR)) {\n",
+  "-\tif (unlikely(entry == DMA_ERROR_CODE)) {\n",
+  "+\tif (unlikely(entry == CALGARY_MAPPING_ERROR)) {\n",
   " \t\tpr_warn(\"failed to allocate %u pages in iommu %p\\n\",\n",
   " \t\t\tnpages, tbl);\n",
   "-\t\treturn DMA_ERROR_CODE;\n",
@@ -96,8 +96,8 @@
   " \t\tnpages = iommu_num_pages(vaddr, s->length, PAGE_SIZE);\n",
   " \n",
   " \t\tentry = iommu_range_alloc(dev, tbl, npages);\n",
-  "-\t\tif (entry = DMA_ERROR_CODE) {\n",
-  "+\t\tif (entry = CALGARY_MAPPING_ERROR) {\n",
+  "-\t\tif (entry == DMA_ERROR_CODE) {\n",
+  "+\t\tif (entry == CALGARY_MAPPING_ERROR) {\n",
   " \t\t\t/* makes sure unmap knows to stop */\n",
   " \t\t\ts->dma_length = 0;\n",
   " \t\t\tgoto error;\n",
@@ -114,8 +114,8 @@
   " \n",
   " \t/* set up tces to cover the allocated range */\n",
   " \tmapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL);\n",
-  "-\tif (mapping = DMA_ERROR_CODE)\n",
-  "+\tif (mapping = CALGARY_MAPPING_ERROR)\n",
+  "-\tif (mapping == DMA_ERROR_CODE)\n",
+  "+\tif (mapping == CALGARY_MAPPING_ERROR)\n",
   " \t\tgoto free;\n",
   " \t*dma_handle = mapping;\n",
   " \treturn ret;\n",
@@ -125,7 +125,7 @@
   " \n",
   "+static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
   "+{\n",
-  "+\treturn dma_addr = CALGARY_MAPPING_ERROR;\n",
+  "+\treturn dma_addr == CALGARY_MAPPING_ERROR;\n",
   "+}\n",
   "+\n",
   " static const struct dma_map_ops calgary_dma_ops = {\n",
@@ -152,4 +152,4 @@
   "2.11.0"
 ]
 
-8440192bd0087efee4761f0b03686ac7d747c85927a45c869eb6a769d76f8a72
+bec752813be308fab1e11d059dafc7ff75a038b71cefe54332799b5276023dd1

diff --git a/a/1.txt b/N3/1.txt
index 15ee8bf..1847d8f 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -31,8 +31,8 @@ index fda7867046d0..e75b490f2b0b 100644
  
  	entry = iommu_range_alloc(dev, tbl, npages);
  
--	if (unlikely(entry = DMA_ERROR_CODE)) {
-+	if (unlikely(entry = CALGARY_MAPPING_ERROR)) {
+-	if (unlikely(entry == DMA_ERROR_CODE)) {
++	if (unlikely(entry == CALGARY_MAPPING_ERROR)) {
  		pr_warn("failed to allocate %u pages in iommu %p\n",
  			npages, tbl);
 -		return DMA_ERROR_CODE;
@@ -53,8 +53,8 @@ index fda7867046d0..e75b490f2b0b 100644
  		npages = iommu_num_pages(vaddr, s->length, PAGE_SIZE);
  
  		entry = iommu_range_alloc(dev, tbl, npages);
--		if (entry = DMA_ERROR_CODE) {
-+		if (entry = CALGARY_MAPPING_ERROR) {
+-		if (entry == DMA_ERROR_CODE) {
++		if (entry == CALGARY_MAPPING_ERROR) {
  			/* makes sure unmap knows to stop */
  			s->dma_length = 0;
  			goto error;
@@ -71,8 +71,8 @@ index fda7867046d0..e75b490f2b0b 100644
  
  	/* set up tces to cover the allocated range */
  	mapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL);
--	if (mapping = DMA_ERROR_CODE)
-+	if (mapping = CALGARY_MAPPING_ERROR)
+-	if (mapping == DMA_ERROR_CODE)
++	if (mapping == CALGARY_MAPPING_ERROR)
  		goto free;
  	*dma_handle = mapping;
  	return ret;
@@ -82,7 +82,7 @@ index fda7867046d0..e75b490f2b0b 100644
  
 +static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr)
 +{
-+	return dma_addr = CALGARY_MAPPING_ERROR;
++	return dma_addr == CALGARY_MAPPING_ERROR;
 +}
 +
  static const struct dma_map_ops calgary_dma_ops = {
diff --git a/a/content_digest b/N3/content_digest
index c70603d..aa6f41a 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 23/44] x86/calgary: implement ->mapping_error\0"
 ]
 [
-  "Date\0Fri, 16 Jun 2017 18:10:38 +0000\0"
+  "Date\0Fri, 16 Jun 2017 20:10:38 +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"
@@ -74,8 +53,8 @@
   " \n",
   " \tentry = iommu_range_alloc(dev, tbl, npages);\n",
   " \n",
-  "-\tif (unlikely(entry = DMA_ERROR_CODE)) {\n",
-  "+\tif (unlikely(entry = CALGARY_MAPPING_ERROR)) {\n",
+  "-\tif (unlikely(entry == DMA_ERROR_CODE)) {\n",
+  "+\tif (unlikely(entry == CALGARY_MAPPING_ERROR)) {\n",
   " \t\tpr_warn(\"failed to allocate %u pages in iommu %p\\n\",\n",
   " \t\t\tnpages, tbl);\n",
   "-\t\treturn DMA_ERROR_CODE;\n",
@@ -96,8 +75,8 @@
   " \t\tnpages = iommu_num_pages(vaddr, s->length, PAGE_SIZE);\n",
   " \n",
   " \t\tentry = iommu_range_alloc(dev, tbl, npages);\n",
-  "-\t\tif (entry = DMA_ERROR_CODE) {\n",
-  "+\t\tif (entry = CALGARY_MAPPING_ERROR) {\n",
+  "-\t\tif (entry == DMA_ERROR_CODE) {\n",
+  "+\t\tif (entry == CALGARY_MAPPING_ERROR) {\n",
   " \t\t\t/* makes sure unmap knows to stop */\n",
   " \t\t\ts->dma_length = 0;\n",
   " \t\t\tgoto error;\n",
@@ -114,8 +93,8 @@
   " \n",
   " \t/* set up tces to cover the allocated range */\n",
   " \tmapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL);\n",
-  "-\tif (mapping = DMA_ERROR_CODE)\n",
-  "+\tif (mapping = CALGARY_MAPPING_ERROR)\n",
+  "-\tif (mapping == DMA_ERROR_CODE)\n",
+  "+\tif (mapping == CALGARY_MAPPING_ERROR)\n",
   " \t\tgoto free;\n",
   " \t*dma_handle = mapping;\n",
   " \treturn ret;\n",
@@ -125,7 +104,7 @@
   " \n",
   "+static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr)\n",
   "+{\n",
-  "+\treturn dma_addr = CALGARY_MAPPING_ERROR;\n",
+  "+\treturn dma_addr == CALGARY_MAPPING_ERROR;\n",
   "+}\n",
   "+\n",
   " static const struct dma_map_ops calgary_dma_ops = {\n",
@@ -152,4 +131,4 @@
   "2.11.0"
 ]
 
-8440192bd0087efee4761f0b03686ac7d747c85927a45c869eb6a769d76f8a72
+4e09d862c6820b786b6fc8d7b1f4bf802d391ba9664334f1d09b878235d6b935
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.