diff for duplicates of <1428008044.20500.272.camel@kernel.crashing.org> diff --git a/a/1.txt b/N1/1.txt index 38df30c..cf3402c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ On Tue, 2015-03-31 at 10:40 -0400, Sowmini Varadhan wrote: Move spin_lock_irqsave outside of if/else > + again: -> + if (pass == 0 && handle && *handle && +> + if (pass = 0 && handle && *handle && > + (*handle >= pool->start) && (*handle < pool->end)) > + start = *handle; > + else @@ -49,7 +49,7 @@ never calls lazy_flush on a large allocation. Also, if you fix the problem I mentioned earlier about *handle < hint, you also don't need the above flush, it will be handled further down -in the else case for the if (n == -1), see below +in the else case for the if (n = -1), see below > + } @@ -81,8 +81,8 @@ drivers. There are cases (especially with consistent allocations) where the driver have alignment constraints on the address, those must be preserved. -> + if (n == -1) { -> + if (likely(pass == 0)) { +> + if (n = -1) { +> + if (likely(pass = 0)) { > + /* First failure, rescan from the beginning. */ > + pool->hint = pool->start; > + if (!large_pool && iommu->lazy_flush != NULL) @@ -188,7 +188,7 @@ Here I would put the test for lazy_flush being non-NULL > + unsigned long flags; > + unsigned long shift = iommu->table_shift; > + -> + if (entry == DMA_ERROR_CODE) /* use default addr->entry mapping */ +> + if (entry = DMA_ERROR_CODE) /* use default addr->entry mapping */ > + entry = (dma_addr - iommu->table_map_base) >> shift; > + pool = get_pool(iommu, entry); > + diff --git a/a/content_digest b/N1/content_digest index d5bce1b..fb50885 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\0cover.1427761300.git.sowmini.varadhan@oracle.com\0" "ref\08406d119fb885255387a400551de994cb4a4c331.1427761300.git.sowmini.varadhan@oracle.com\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" - "Subject\0Re: [PATCH v8 RFC 1/3] sparc: Break up monolithic iommu table/lock into finer graularity pools and lock\0" - "Date\0Fri, 03 Apr 2015 07:54:04 +1100\0" + "Subject\0Re: [PATCH v8 RFC 1/3] sparc: Break up monolithic iommu table/lock into finer graularity pools and l\0" + "Date\0Thu, 02 Apr 2015 20:54:04 +0000\0" "To\0Sowmini Varadhan <sowmini.varadhan@oracle.com>\0" "Cc\0aik@au1.ibm.com" anton@au1.ibm.com @@ -28,7 +28,7 @@ "Move spin_lock_irqsave outside of if/else\n" "\n" "> + again:\n" - "> +\tif (pass == 0 && handle && *handle &&\n" + "> +\tif (pass = 0 && handle && *handle &&\n" "> +\t (*handle >= pool->start) && (*handle < pool->end))\n" "> +\t\tstart = *handle;\n" "> +\telse\n" @@ -63,7 +63,7 @@ "\n" "Also, if you fix the problem I mentioned earlier about *handle < hint,\n" "you also don't need the above flush, it will be handled further down\n" - "in the else case for the if (n == -1), see below\n" + "in the else case for the if (n = -1), see below\n" "\n" "> +\t}\n" "\n" @@ -95,8 +95,8 @@ "the driver have alignment constraints on the address, those must be\n" "preserved.\n" "\n" - "> +\tif (n == -1) {\n" - "> +\t\tif (likely(pass == 0)) {\n" + "> +\tif (n = -1) {\n" + "> +\t\tif (likely(pass = 0)) {\n" "> +\t\t\t/* First failure, rescan from the beginning. */\n" "> +\t\t\tpool->hint = pool->start;\n" "> +\t\t\tif (!large_pool && iommu->lazy_flush != NULL)\n" @@ -202,7 +202,7 @@ "> +\tunsigned long flags;\n" "> +\tunsigned long shift = iommu->table_shift;\n" "> +\n" - "> +\tif (entry == DMA_ERROR_CODE) /* use default addr->entry mapping */\n" + "> +\tif (entry = DMA_ERROR_CODE) /* use default addr->entry mapping */\n" "> +\t\tentry = (dma_addr - iommu->table_map_base) >> shift;\n" "> +\tpool = get_pool(iommu, entry);\n" "> +\n" @@ -212,4 +212,4 @@ "> +}\n" > +EXPORT_SYMBOL(iommu_tbl_range_free); -8c72f989caf009cee0a264160d2e5ceda5cd60ac0440ba8e568f936a1de42e0b +80c816c2f7c19fd04d79b39c98879f435f68d129165ed2b0f4b43741d53257c9
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.