The patch titled
Subject: mm: remove devm_request_free_mem_region
has been removed from the -mm tree. Its filename was
mm-remove-devm_request_free_mem_region.patch
This patch was dropped because it was withdrawn
------------------------------------------------------
From: Christoph Hellwig <hch@xxxxxx>
Subject: mm: remove devm_request_free_mem_region
Remove the unused devm_request_free_mem_region, massage the kerneldoc
comment for devm_request_free_mem_region into one documenting the actual
used request_free_mem_region function and fold __request_free_mem_region
into request_free_mem_region now that no other caller is left.
Link: https://lkml.kernel.org/r/20210518063922.2910123-1-hch@xxxxxx
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/vm/hmm.rst | 5 +--
include/linux/ioport.h | 2 -
kernel/resource.c | 60 ++++++++-----------------------------
3 files changed, 15 insertions(+), 52 deletions(-)
--- a/Documentation/vm/hmm.rst~mm-remove-devm_request_free_mem_region
+++ a/Documentation/vm/hmm.rst
@@ -299,9 +299,8 @@ These can be allocated and freed with::
memunmap_pages(&pagemap);
release_mem_region(pagemap.range.start, range_len(&pagemap.range));
-There are also devm_request_free_mem_region(), devm_memremap_pages(),
-devm_memunmap_pages(), and devm_release_mem_region() when the resources can
-be tied to a ``struct device``.
+There are also devm_memremap_pages() and devm_memunmap_pages() when the
+resources can be tied to a ``struct device``.
The overall migration steps are similar to migrating NUMA pages within system
memory (see :ref:`Page migration <page_migration>`) but the steps are split
--- a/include/linux/ioport.h~mm-remove-devm_request_free_mem_region
+++ a/include/linux/ioport.h
@@ -323,8 +323,6 @@ extern int
walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start, u64 end,
void *arg, int (*func)(struct resource *, void *));
-struct resource *devm_request_free_mem_region(struct device *dev,
- struct resource *base, unsigned long size);
struct resource *request_free_mem_region(struct resource *base,
unsigned long size, const char *name);
--- a/kernel/resource.c~mm-remove-devm_request_free_mem_region
+++ a/kernel/resource.c
@@ -1775,12 +1775,22 @@ void resource_list_free(struct list_head
EXPORT_SYMBOL(resource_list_free);
#ifdef CONFIG_DEVICE_PRIVATE
-static struct resource *__request_free_mem_region(struct device *dev,
- struct resource *base, unsigned long size, const char *name)
+/**
+ * request_free_mem_region - find free region for device private memory
+ *
+ * @base: resource tree to look in
+ * @size: size in bytes of the device memory to add
+ * @name: name that describes the region
+ *
+ * This function tries to find an empty range of physical address big enough to
+ * contain the new resource, so that it can later be hotplugged as ZONE_DEVICE
+ * memory, which in turn allocates struct pages.
+ */
+struct resource *request_free_mem_region(struct resource *base,
+ unsigned long size, const char *name)
{
resource_size_t end, addr;
struct resource *res;
- struct region_devres *dr = NULL;
size = ALIGN(size, 1UL << PA_SECTION_SHIFT);
end = min_t(unsigned long, base->end, (1UL << MAX_PHYSMEM_BITS) - 1);
@@ -1790,15 +1800,6 @@ static struct resource *__request_free_m
if (!res)
return ERR_PTR(-ENOMEM);
- if (dev) {
- dr = devres_alloc(devm_region_release,
- sizeof(struct region_devres), GFP_KERNEL);
- if (!dr) {
- free_resource(res);
- return ERR_PTR(-ENOMEM);
- }
- }
-
write_lock(&resource_lock);
for (; addr > size && addr >= base->start; addr -= size) {
if (__region_intersects(addr, size, 0, IORES_DESC_NONE) !=
@@ -1809,13 +1810,6 @@ static struct resource *__request_free_m
name, 0))
break;
- if (dev) {
- dr->parent = &iomem_resource;
- dr->start = addr;
- dr->n = size;
- devres_add(dev, dr);
- }
-
res->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY;
write_unlock(&resource_lock);
@@ -1828,37 +1822,9 @@ static struct resource *__request_free_m
write_unlock(&resource_lock);
free_resource(res);
- if (dr)
- devres_free(dr);
-
return ERR_PTR(-ERANGE);
}
-
-/**
- * devm_request_free_mem_region - find free region for device private memory
- *
- * @dev: device struct to bind the resource to
- * @size: size in bytes of the device memory to add
- * @base: resource tree to look in
- *
- * This function tries to find an empty range of physical address big enough to
- * contain the new resource, so that it can later be hotplugged as ZONE_DEVICE
- * memory, which in turn allocates struct pages.
- */
-struct resource *devm_request_free_mem_region(struct device *dev,
- struct resource *base, unsigned long size)
-{
- return __request_free_mem_region(dev, base, size, dev_name(dev));
-}
-EXPORT_SYMBOL_GPL(devm_request_free_mem_region);
-
-struct resource *request_free_mem_region(struct resource *base,
- unsigned long size, const char *name)
-{
- return __request_free_mem_region(NULL, base, size, name);
-}
EXPORT_SYMBOL_GPL(request_free_mem_region);
-
#endif /* CONFIG_DEVICE_PRIVATE */
static int __init strict_iomem(char *str)
_
Patches currently in -mm which might be from hch@xxxxxx are
