diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-12-29 08:54:06 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-01-08 11:46:23 -0800 |
| commit | e697c5b90e97792187e45f8d78fb2bfa62eb0496 (patch) | |
| tree | 04974afac6c78d6b02de1701029c3c8e13d7013d /kernel/memremap.c | |
| parent | e8d5134833006a46fcbefc5f4a84d0b62bd520e7 (diff) | |
| download | linux-stable-e697c5b90e97792187e45f8d78fb2bfa62eb0496.tar.gz linux-stable-e697c5b90e97792187e45f8d78fb2bfa62eb0496.tar.bz2 linux-stable-e697c5b90e97792187e45f8d78fb2bfa62eb0496.zip | |
memremap: merge find_dev_pagemap into get_dev_pagemap
There is only one caller of the trivial function find_dev_pagemap left,
so just merge it into the caller.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'kernel/memremap.c')
| -rw-r--r-- | kernel/memremap.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/kernel/memremap.c b/kernel/memremap.c index a9a948cd3d7f..ada31b0d76d4 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -306,14 +306,6 @@ static void devm_memremap_pages_release(void *data) "%s: failed to free all reserved pages\n", __func__); } -/* assumes rcu_read_lock() held at entry */ -static struct dev_pagemap *find_dev_pagemap(resource_size_t phys) -{ - WARN_ON_ONCE(!rcu_read_lock_held()); - - return radix_tree_lookup(&pgmap_radix, PHYS_PFN(phys)); -} - /** * devm_memremap_pages - remap and provide memmap backing for the given resource * @dev: hosting device for @res @@ -466,7 +458,7 @@ struct dev_pagemap *get_dev_pagemap(unsigned long pfn, /* fall back to slow path lookup */ rcu_read_lock(); - pgmap = find_dev_pagemap(phys); + pgmap = radix_tree_lookup(&pgmap_radix, PHYS_PFN(phys)); if (pgmap && !percpu_ref_tryget_live(pgmap->ref)) pgmap = NULL; rcu_read_unlock(); |