kernel-resource-make-iomem_resource-implicit-in-release_mem_region_adjustable.patch removed from -mm tree
The patch titled
Subject: kernel/resource: make iomem_resource implicit in release_mem_region_adjustable()
has been removed from the -mm tree. Its filename was
kernel-resource-make-iomem_resource-implicit-in-release_mem_region_adjustable.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: kernel/resource: make iomem_resource implicit in release_mem_region_adjustable()
"mem" in the name already indicates the root, similar to release_mem_region() and devm_request_mem_region(). Make it implicit. The only single caller always passes iomem_resource, other parents are not applicable.
---
include/linux/ioport.h | 3 +-- kernel/resource.c | 5 ++--- mm/memory_hotplug.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-)
include/linux/ioport.h renamed from include/linux/ioport.h~kernel-resource-make-iomem_resource-implicit-in-release_mem_region_adjustable +1 -2
@@ -251,8 +251,7 @@ extern struct resource * __request_regioextern void __release_region (struct resource *,resource_size_t ,resource_size_t );#ifdef CONFIG_MEMORY_HOTREMOVE -extern void release_mem_region_adjustable (struct resource *,resource_size_t , -resource_size_t ); +extern void release_mem_region_adjustable (resource_size_t ,resource_size_t );#endif #ifdef CONFIG_MEMORY_HOTPLUG extern void merge_system_ram_resource (struct resource *res);
kernel/resource.c renamed from kernel/resource.c~kernel-resource-make-iomem_resource-implicit-in-release_mem_region_adjustable +2 -3
@@ -1240,7 +1240,6 @@ EXPORT_SYMBOL(__release_region);#ifdef CONFIG_MEMORY_HOTREMOVE /** * release_mem_region_adjustable - release a previously reserved memory region -* @parent: parent resource descriptor * @start: resource start address * @size: resource region size *
@@ -1258,9 +1257,9 @@ EXPORT_SYMBOL(__release_region);* assumes that all children remain in the lower address entry for * simplicity. Enhance this logic when necessary. */ -void release_mem_region_adjustable (struct resource *parent, -resource_size_t start,resource_size_t size) +void release_mem_region_adjustable (resource_size_t start,resource_size_t size) { +struct resource *parent = &iomem_resource;struct resource *new_res =NULL ;bool alloc_nofail = false;struct resource **p;
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~kernel-resource-make-iomem_resource-implicit-in-release_mem_region_adjustable +1 -1
@@ -1767,7 +1767,7 @@ static int __ref try_remove_memory(int nmemblock_remove (start, size); } -release_mem_region_adjustable (&iomem_resource, start, size); +release_mem_region_adjustable (start, size);try_offline_node (nid);
_
Patches currently in -mm which might be from [email protected] are