aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-12-29 02:54:03 -0500
committerDan Williams <dan.j.williams@intel.com>2018-01-08 14:46:23 -0500
commit7003e3b1f64d0195ea9d31aed0b096ad38f3cb54 (patch)
treead2b8ba6141e740e4b8df2b8f595b511e7239b1f
parent0628b8c650718f4dfedfcdc9ed136bf7e394aae7 (diff)
memremap: simplify duplicate region handling in devm_memremap_pages
__radix_tree_insert already checks for duplicates and returns -EEXIST in that case, so remove the duplicate (and racy) duplicates check. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Logan Gunthorpe <logang@deltatee.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--kernel/memremap.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/kernel/memremap.c b/kernel/memremap.c
index b09517439dec..12e78528fea4 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -396,17 +396,6 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,
396 align_end = align_start + align_size - 1; 396 align_end = align_start + align_size - 1;
397 397
398 foreach_order_pgoff(res, order, pgoff) { 398 foreach_order_pgoff(res, order, pgoff) {
399 struct dev_pagemap *dup;
400
401 rcu_read_lock();
402 dup = find_dev_pagemap(res->start + PFN_PHYS(pgoff));
403 rcu_read_unlock();
404 if (dup) {
405 dev_err(dev, "%s: %pr collides with mapping for %s\n",
406 __func__, res, dev_name(dup->dev));
407 error = -EBUSY;
408 break;
409 }
410 error = __radix_tree_insert(&pgmap_radix, 399 error = __radix_tree_insert(&pgmap_radix,
411 PHYS_PFN(res->start) + pgoff, order, page_map); 400 PHYS_PFN(res->start) + pgoff, order, page_map);
412 if (error) { 401 if (error) {