diff for duplicates of <1428481825.18187.10.camel@kernel.crashing.org> diff --git a/a/1.txt b/N1/1.txt index 0bd242a..35de410 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -198,7 +198,7 @@ Ben. > + struct iommu_pool *p = &(iommu->large_pool); > + > + setup_iommu_pool_hash(); -> + if (npools == 0) +> + if (npools = 0) > + iommu->nr_pools = IOMMU_NR_POOLS; > + else > + iommu->nr_pools = npools; @@ -256,7 +256,7 @@ Ben. > + align_mask = 0xffffffffffffffffl >> (64 - align_order); > + > + /* Sanity check */ -> + if (unlikely(npages == 0)) { +> + if (unlikely(npages = 0)) { > + WARN_ON_ONCE(1); > + return DMA_ERROR_CODE; > + } @@ -272,7 +272,7 @@ Ben. > + spin_lock_irqsave(&pool->lock, flags); > + > + again: -> + if (pass == 0 && handle && *handle && +> + if (pass = 0 && handle && *handle && > + (*handle >= pool->start) && (*handle < pool->end)) > + start = *handle; > + else @@ -323,8 +323,8 @@ Ben. > + } > + n = iommu_area_alloc(iommu->map, limit, start, npages, shift, > + boundary_size, align_mask); -> + if (n == -1) { -> + if (likely(pass == 0)) { +> + if (n = -1) { +> + if (likely(pass = 0)) { > + /* First failure, rescan from the beginning. */ > + pool->hint = pool->start; > + set_flush(iommu); @@ -393,7 +393,7 @@ Ben. > + 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 e770bd5..a88ea39 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0a259c5bbc3d98dbaedc73a88250a5e7c937ec5f9.1428181553.git.sowmini.varadhan@oracle.com\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCHv9 RFC 1/3] Break up monolithic iommu table/lock into finer graularity pools and lock\0" - "Date\0Wed, 08 Apr 2015 18:30:25 +1000\0" + "Date\0Wed, 08 Apr 2015 08:30:25 +0000\0" "To\0Sowmini Varadhan <sowmini.varadhan@oracle.com>\0" "Cc\0aik@au1.ibm.com" anton@au1.ibm.com @@ -212,7 +212,7 @@ "> +\tstruct iommu_pool *p = &(iommu->large_pool);\n" "> +\n" "> +\tsetup_iommu_pool_hash();\n" - "> +\tif (npools == 0)\n" + "> +\tif (npools = 0)\n" "> +\t\tiommu->nr_pools = IOMMU_NR_POOLS;\n" "> +\telse\n" "> +\t\tiommu->nr_pools = npools;\n" @@ -270,7 +270,7 @@ "> +\t\talign_mask = 0xffffffffffffffffl >> (64 - align_order);\n" "> +\n" "> +\t/* Sanity check */\n" - "> +\tif (unlikely(npages == 0)) {\n" + "> +\tif (unlikely(npages = 0)) {\n" "> +\t\tWARN_ON_ONCE(1);\n" "> +\t\treturn DMA_ERROR_CODE;\n" "> +\t}\n" @@ -286,7 +286,7 @@ "> +\tspin_lock_irqsave(&pool->lock, flags);\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" @@ -337,8 +337,8 @@ "> +\t}\n" "> +\tn = iommu_area_alloc(iommu->map, limit, start, npages, shift,\n" "> +\t\t\t boundary_size, align_mask);\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\tset_flush(iommu);\n" @@ -407,7 +407,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" @@ -417,4 +417,4 @@ "> +}\n" > +EXPORT_SYMBOL(iommu_tbl_range_free); -f273bcf5f164c559373696ef169418eae02c1356d93d43aa24b21fc9932ffac7 +8b6d2b2b48244ac72b5d6d03713a754806845e17bbe9bf8f9d3e9aa1b1d5d0cd
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.